[Xfce4-commits] r25793 - in xfce4-panel/trunk: panel plugins/clock

[Jasper Huijsmans]

Author: jasper
Date: 2007-06-10 12:01:42 +0000 (Sun, 10 Jun 2007)
New Revision: 25793

Modified:
   xfce4-panel/trunk/panel/panel-dialogs.c
   xfce4-panel/trunk/panel/panel-item-manager.c
   xfce4-panel/trunk/panel/panel.c
   xfce4-panel/trunk/plugins/clock/clock.c
Log:
* Use sizeof() to pass buffer sizes for statically alocated buffers.
* Fix allocation of resource directories for loading plugins in kiosk mode.

Modified: xfce4-panel/trunk/panel/panel-dialogs.c
===================================================================
--- xfce4-panel/trunk/panel/panel-dialogs.c	2007-06-10 09:48:20 UTC (rev 25792)
+++ xfce4-panel/trunk/panel/panel-dialogs.c	2007-06-10 12:01:42 UTC (rev 25793)
@@ -272,12 +272,12 @@
 
         if (info->comment)
         {
-            g_snprintf (text, 512, "<b>%s</b>\n%s", info->display_name,
+            g_snprintf (text, sizeof(text), "<b>%s</b>\n%s", info->display_name,
                                     info->comment);
         }
         else
         {
-            g_snprintf (text, 512, "<b>%s</b>", info->display_name);
+            g_snprintf (text, sizeof(text), "<b>%s</b>", info->display_name);
         }
 
         g_object_set (G_OBJECT (cell),
@@ -1333,7 +1333,7 @@
                 gtk_widget_set_size_request (scroll, req.width, -1);
             }
 
-            g_snprintf (markup, 10, "<b>%d</b>", i + 1);
+            g_snprintf (markup, sizeof(markup), "<b>%d</b>", i + 1);
 
             ebox = gtk_event_box_new ();
             style = gtk_widget_get_style (ebox);
@@ -1455,7 +1455,7 @@
     /* transparency */
     if (G_UNLIKELY (!composite_atom))
     {
-        g_snprintf (text, 16, "_NET_WM_CM_S%d",
+        g_snprintf (text, sizeof(text), "_NET_WM_CM_S%d",
                     GDK_SCREEN_XNUMBER(gdk_screen_get_default()));
         composite_atom =
             XInternAtom (GDK_DISPLAY (), text, False);
@@ -1560,7 +1560,7 @@
 
     panel_block_autohide (PANEL (g_ptr_array_index (pmd->panels, n)));
 
-    g_snprintf (name, 20, _("Panel %d"), pmd->panels->len);
+    g_snprintf (name, sizeof(name), _("Panel %d"), pmd->panels->len);
 
     gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->panel_selector), name);
 
@@ -1596,7 +1596,7 @@
 
     for (i = 0; i < pmd->panels->len; ++i)
     {
-        g_snprintf (name, 20, _("Panel %d"), i + 1);
+        g_snprintf (name, sizeof(name), _("Panel %d"), i + 1);
 
         gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->panel_selector), name);
     }
@@ -1620,7 +1620,7 @@
 
     for (i = 0; i < pmd->panels->len; ++i)
     {
-        g_snprintf (name, 20, _("Panel %d"), i + 1);
+        g_snprintf (name, sizeof(name), _("Panel %d"), i + 1);
 
         gtk_combo_box_append_text (GTK_COMBO_BOX (pmd->panel_selector), name);
     }

Modified: xfce4-panel/trunk/panel/panel-item-manager.c
===================================================================
--- xfce4-panel/trunk/panel/panel-item-manager.c	2007-06-10 09:48:20 UTC (rev 25792)
+++ xfce4-panel/trunk/panel/panel-item-manager.c	2007-06-10 12:01:42 UTC (rev 25793)
@@ -298,24 +298,31 @@
     XfcePanelItemClass  *klass;
 
     if (G_LIKELY (xfce_allow_panel_customization() == TRUE))
+    {
         /* if panel customization is allowed, we search all resource dirs */
         directories = xfce_resource_dirs (XFCE_RESOURCE_DATA);
+
+        /* check if the DATADIR is in the list */
+        for (n = 0; directories[n] != NULL; ++n)
+            if (strcmp (directories[n], DATADIR) == 0)
+                break;
+
+        if (G_UNLIKELY (directories[n] == NULL))
+        {
+            /* append the datadir path */
+            directories      = g_realloc (directories, (n + 2) * sizeof (gchar*));
+            directories[n]   = g_strdup (DATADIR);
+            directories[n+1] = NULL;
+        }
+    }
     else 
+    {
         /* only append the data directory */
-        *directories = NULL;
+        directories    = g_new0 ( char*, 2 );
+        directories[0] = g_strdup (DATADIR);
+        directories[1] = NULL;
+    }
 
-    /* check if the DATADIR is in the list */
-    for (n = 0; directories[n] != NULL; ++n)
-        if (strcmp (directories[n], DATADIR) == 0)
-            goto has_datadir;
-
-    /* append the datadir path */
-    directories      = g_realloc (directories, (n + 2) * sizeof (gchar*));
-    directories[n]   = g_strdup (DATADIR);
-    directories[n+1] = NULL;
-    
-    has_datadir:
-
     /* walk through the directories */
     for (n = 0; directories[n] != NULL; ++n)
     {

Modified: xfce4-panel/trunk/panel/panel.c
===================================================================
--- xfce4-panel/trunk/panel/panel.c	2007-06-10 09:48:20 UTC (rev 25792)
+++ xfce4-panel/trunk/panel/panel.c	2007-06-10 12:01:42 UTC (rev 25793)
@@ -987,7 +987,7 @@
     static char id[30];
 
     /* unique number: pseudo-random time() + counter */
-    g_snprintf (id, 30, "%ld%d", (glong) time (NULL), counter++);
+    g_snprintf (id, sizeof(id), "%ld%d", (glong) time (NULL), counter++);
 
     return id;
 }

Modified: xfce4-panel/trunk/plugins/clock/clock.c
===================================================================
--- xfce4-panel/trunk/plugins/clock/clock.c	2007-06-10 09:48:20 UTC (rev 25792)
+++ xfce4-panel/trunk/plugins/clock/clock.c	2007-06-10 12:01:42 UTC (rev 25793)
@@ -173,7 +173,7 @@
 	 * %B  : full month name
 	 * %Y  : four digit year
 	 */
-        strftime(date_s, 255, _("%A %d %B %Y"), tm);
+        strftime(date_s, sizeof(date_s), _("%A %d %B %Y"), tm);
 
         /* Conversion to utf8
          * Patch by Oliver M. Bolzer <oliver at fakeroot.net>