[Xfce4-commits] r26933 - xfconf/trunk/xfsettingsd

[Brian Tarricone]

Author: kelnos
Date: 2008-05-07 06:15:09 +0000 (Wed, 07 May 2008)
New Revision: 26933

Modified:
   xfconf/trunk/xfsettingsd/main.c
   xfconf/trunk/xfsettingsd/registry.c
Log:
fix compilation with older compilers


Modified: xfconf/trunk/xfsettingsd/main.c
===================================================================
--- xfconf/trunk/xfsettingsd/main.c	2008-05-06 03:31:51 UTC (rev 26932)
+++ xfconf/trunk/xfsettingsd/main.c	2008-05-07 06:15:09 UTC (rev 26933)
@@ -112,6 +112,8 @@
 main(int argc, char **argv)
 {
     GError *cli_error = NULL;
+    gint screen;
+    Window window = None;
 
     xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
 
@@ -133,10 +135,8 @@
 
     xfconf_init(NULL);
 
-    gint screen = DefaultScreen(gdk_display);
+    screen = DefaultScreen(gdk_display);
         
-    Window window = 0;
-
     running = settings_daemon_check_running(GDK_DISPLAY(), DefaultScreen(GDK_DISPLAY()));
 
     if (running)
@@ -155,11 +155,14 @@
 
     if ((running && force_replace) || (!running))
     {
+        XfconfChannel *channel;
+        XSettingsRegistry *registry;
+
         XF_DEBUG("Initializing...\n");
 
-        XfconfChannel *channel = xfconf_channel_new("xsettings");
+        channel = xfconf_channel_new("xsettings");
 
-        XSettingsRegistry *registry = xsettings_registry_new(channel, gdk_display, screen);
+        registry = xsettings_registry_new(channel, gdk_display, screen);
         
         xsettings_registry_load(registry, debug);
 

Modified: xfconf/trunk/xfsettingsd/registry.c
===================================================================
--- xfconf/trunk/xfsettingsd/registry.c	2008-05-06 03:31:51 UTC (rev 26932)
+++ xfconf/trunk/xfsettingsd/registry.c	2008-05-07 06:15:09 UTC (rev 26933)
@@ -220,12 +220,14 @@
 void
 xsettings_registry_notify(XSettingsRegistry *registry)
 {
+    guchar *buffer, *pos;
+    gint buf_len, i;
+
     registry->priv->last_change_serial = registry->priv->serial;
 
     XSettingsRegistryEntry *entry = NULL;
 
-    gint buf_len = 12;
-    gint i;
+    buf_len = 12;
 
     /** Calculate buffer size */
     for(i = 0; i < XSETTINGS_REGISTRY_SIZE; ++i)
@@ -255,8 +257,8 @@
         }
     }
 
-    guchar *buffer = NULL;
-    guchar *pos = buffer = g_new0(guchar, buf_len);
+    buffer = NULL;
+    pos = buffer = g_new0(guchar, buf_len);
 
     *(CARD32 *)pos = LSBFirst;
     pos +=4;
@@ -270,10 +272,12 @@
     /** Fill the buffer */
     for(i = 0; i < XSETTINGS_REGISTRY_SIZE; ++i)
     {
+        gint name_len, value_len = 0, str_length;
+
         entry = registry->priv->properties[i];
 
-        gint name_len = XSETTINGS_PAD(strlen(entry->name), 4);
-        gint value_len = 0;
+        name_len = XSETTINGS_PAD(strlen(entry->name), 4);
+        value_len = 0;
 
         switch (G_VALUE_TYPE(entry->value))
         {
@@ -301,7 +305,7 @@
         }
         *pos++ = 0;
 
-        gint str_length = strlen(entry->name);
+        str_length = strlen(entry->name);
         *(CARD16 *)pos = str_length;
         pos += 2;
         memcpy (pos, entry->name, str_length);
@@ -417,6 +421,8 @@
     unsigned char c = 'a';
     TimeStampInfo info;
     XEvent xevent;
+    Atom selection_atom, manager_atom;
+    GObject *object;
 
     window = XCreateSimpleWindow (dpy,
 					 RootWindow (dpy, screen),
@@ -430,18 +436,18 @@
     }
 
     g_snprintf(buffer, sizeof(buffer), "_XSETTINGS_S%d", screen);
-    Atom selection_atom = XInternAtom(dpy, buffer, True);
-    Atom manager_atom = XInternAtom(dpy, "MANAGER", True);
+    selection_atom = XInternAtom(dpy, buffer, True);
+    manager_atom = XInternAtom(dpy, "MANAGER", True);
 
 
-    GObject *object = g_object_new(XSETTINGS_REGISTRY_TYPE,
-                                   "channel", channel,
-                                   "display", dpy,
-                                   "screen", screen,
-                                   "xsettings_atom", xsettings_atom,
-                                   "selection_atom", selection_atom,
-                                   "window", window,
-                                   NULL);
+    object = g_object_new(XSETTINGS_REGISTRY_TYPE,
+                          "channel", channel,
+                          "display", dpy,
+                          "screen", screen,
+                          "xsettings_atom", xsettings_atom,
+                          "selection_atom", selection_atom,
+                          "window", window,
+                          NULL);
 
     info.timestamp_prop_atom = XInternAtom(dpy, "_TIMESTAMP_PROP", False);
     info.window = window;