--- xfce4-indicator-plugin-0.5.0.orig/panel-plugin/indicator.c +++ xfce4-indicator-plugin-0.5.0/panel-plugin/indicator.c @@ -101,9 +101,25 @@ indicator_save (XfcePanelPlugin *plugin, static void indicator_read (IndicatorPlugin *indicator) { - XfconfChannel * channel = xfconf_channel_get ("xfce4-panel"); + XfceRc * rc; + gchar * file; + XfconfChannel * channel = xfconf_channel_get (xfce_panel_get_channel_name ()); gchar * property = g_strconcat (xfce_panel_plugin_get_property_base(indicator->plugin),"/blacklist",NULL); indicator->excluded_modules = xfconf_channel_get_string_list(channel, property); + /* if it's empty, try to migrate from old XfceRc file */ + if (indicator->excluded_modules == NULL) { + file = xfce_panel_plugin_lookup_rc_file (indicator->plugin); + if (file != NULL) { + rc = xfce_rc_simple_open (file, TRUE); + g_free (file); + if (rc != NULL) { + indicator->excluded_modules = xfce_rc_read_list_entry (rc, "Exclude", NULL); + xfce_rc_close (rc); + if (indicator->excluded_modules != NULL) + xfconf_channel_set_string_list (channel, property, (const gchar * const *)indicator->excluded_modules); + } + } + } g_free (property); property = g_strconcat (xfce_panel_plugin_get_property_base(indicator->plugin),"/icon-size-max",NULL); xfconf_g_property_bind (channel, property, G_TYPE_INT, indicator->buttonbox, "icon-size-max");