hook gvariant vectors up to kdbus

[platform/upstream/glib.git] / gio / gnextstepsettingsbackend.c

diff --git a/gio/gnextstepsettingsbackend.c b/gio/gnextstepsettingsbackend.c
index 3f609dd..f9b808c 100644 (file)
--- a/gio/gnextstepsettingsbackend.c
+++ b/gio/gnextstepsettingsbackend.c
@@ -12,19 +12,21 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: William Hua <william@attente.ca>
  */
 
+#include "config.h"
+
 #include "gsettingsbackendinternal.h"
 #include "gsimplepermission.h"
 #include "giomodule.h"
 
 #import <Foundation/Foundation.h>
 
+GType g_nextstep_settings_backend_get_type (void);
+
 #define G_NEXTSTEP_SETTINGS_BACKEND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), g_nextstep_settings_backend_get_type (), GNextstepSettingsBackend))
 
 typedef struct _GNextstepSettingsBackend GNextstepSettingsBackend;
@@ -340,7 +342,12 @@ g_nextstep_settings_backend_get_g_variant (id                  object,
 
           g_variant_builder_init (&builder, type);
 
-          for (key in object)
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+          for(key in object)
+#else
+          NSEnumerator *enumerator = [object objectEnumerator];
+          while((key = [enumerator nextObject]))
+#endif
             {
               GVariant *name;
               id value;
@@ -376,7 +383,12 @@ g_nextstep_settings_backend_get_g_variant (id                  object,
           value_type = g_variant_type_element (type);
           g_variant_builder_init (&builder, type);
 
-          for (value in object)
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
+          for(value in object)
+#else
+          NSEnumerator *enumerator = [object objectEnumerator];
+          while((value = [enumerator nextObject]))
+#endif
             {
               GVariant *variant = g_nextstep_settings_backend_get_g_variant (value, value_type);