[Xfce4-commits] <xfce4-panel:devel> Make the rows property an uint and fix migrate.

[Nick Schermer]

Updating branch refs/heads/devel
         to 1832fe88d55d3c1548f4374ae742fb0c11c0c024 (commit)
       from 4de1da0158b163c08b7c0ecf46415e8fa8388bbc (commit)

commit 1832fe88d55d3c1548f4374ae742fb0c11c0c024
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Nov 27 17:24:14 2009 +0100

    Make the rows property an uint and fix migrate.

 migrate/migrate-46.c      |    2 +-
 plugins/systray/systray.c |   17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/migrate/migrate-46.c b/migrate/migrate-46.c
index 572e369..2a65d37 100644
--- a/migrate/migrate-46.c
+++ b/migrate/migrate-46.c
@@ -533,7 +533,7 @@ migrate_46_plugin_systray (XfconfChannel *channel,
       xfce_rc_set_group (rc, "Global");
 
       migrate_46_plugin_bool ("ShowFrame", "show-frame", TRUE);
-      migrate_46_plugin_bool ("Rows", "rows", 1);
+      migrate_46_plugin_uint ("Rows", "rows", 1);
     }
 
   if (xfce_rc_has_group (rc, "Applications"))
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index 49f247e..ae2a573 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -134,10 +134,10 @@ systray_plugin_class_init (SystrayPluginClass *klass)
 
   g_object_class_install_property (gobject_class,
                                    PROP_ROWS,
-                                   g_param_spec_int ("rows",
-                                                     NULL, NULL,
-                                                     1, 10, 1,
-                                                     EXO_PARAM_READWRITE));
+                                   g_param_spec_uint ("rows",
+                                                      NULL, NULL,
+                                                      1, 10, 1,
+                                                      EXO_PARAM_READWRITE));
 
   g_object_class_install_property (gobject_class,
                                    PROP_SHOW_FRAME,
@@ -176,13 +176,13 @@ systray_plugin_get_property (GObject    *object,
                              GParamSpec *pspec)
 {
   SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (object);
-  gint           rows;
+  guint          rows;
 
   switch (prop_id)
     {
       case PROP_ROWS:
         rows = systray_box_get_rows (XFCE_SYSTRAY_BOX (plugin->box));
-        g_value_set_int (value, rows);
+        g_value_set_uint (value, rows);
         break;
 
       case PROP_SHOW_FRAME:
@@ -204,14 +204,13 @@ systray_plugin_set_property (GObject      *object,
                              GParamSpec   *pspec)
 {
   SystrayPlugin *plugin = XFCE_SYSTRAY_PLUGIN (object);
-  gint           rows;
   gboolean       show_frame;
 
   switch (prop_id)
     {
       case PROP_ROWS:
-        rows = g_value_get_int (value);
-        systray_box_set_rows (XFCE_SYSTRAY_BOX (plugin->box), rows);
+        systray_box_set_rows (XFCE_SYSTRAY_BOX (plugin->box),
+                              g_value_get_uint (value));
         break;
 
       case PROP_SHOW_FRAME: