Browse Source

Make the rows property an uint and fix migrate.

upstream/xfce4-panel-4.10.1
Nick Schermer 13 years ago
parent
commit
6caacf9816
  1. 2
      migrate/migrate-46.c
  2. 17
      plugins/systray/systray.c

2
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"))

17
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:

Loading…
Cancel
Save