diff options
| -rw-r--r-- | applets/clock/clock.c | 11 | ||||
| -rw-r--r-- | data/mate-panel.convert | 2 | ||||
| -rw-r--r-- | mate-panel/panel-layout.c | 5 |
3 files changed, 15 insertions, 3 deletions
diff --git a/applets/clock/clock.c b/applets/clock/clock.c index 44b844e8..bcbf847d 100644 --- a/applets/clock/clock.c +++ b/applets/clock/clock.c @@ -2264,6 +2264,17 @@ static void setup_gsettings (ClockData *cd) { cd->settings = mate_panel_applet_settings_new (MATE_PANEL_APPLET (cd->applet), CLOCK_SCHEMA); + + /* hack to allow users to set custom format in dconf-editor */ + gint format; + gchar *custom_format; + format = g_settings_get_enum (cd->settings, KEY_FORMAT); + custom_format = g_settings_get_string (cd->settings, KEY_CUSTOM_FORMAT); + g_settings_set_enum (cd->settings, KEY_FORMAT, format); + g_settings_set_string (cd->settings, KEY_CUSTOM_FORMAT, custom_format); + if (custom_format != NULL) + g_free (custom_format); + g_signal_connect (cd->settings, "changed::" KEY_FORMAT, G_CALLBACK (format_changed), cd); g_signal_connect (cd->settings, "changed::" KEY_SHOW_SECONDS, G_CALLBACK (show_seconds_changed), cd); g_signal_connect (cd->settings, "changed::" KEY_SHOW_DATE, G_CALLBACK (show_date_changed), cd); diff --git a/data/mate-panel.convert b/data/mate-panel.convert index 48a236e5..93dcc7cd 100644 --- a/data/mate-panel.convert +++ b/data/mate-panel.convert @@ -2,8 +2,6 @@ enable-program-list = /apps/panel/general/enable_program_list show-program-list = /apps/panel/general/show_program_list enable-autocompletion = /apps/panel/general/enable_autocompletion -toplevel-id-list = /apps/panel/general/toplevel_id_list -object-id-list = /apps/panel/general/object_id_list tooltips-enabled = /apps/panel/global/tooltips_enabled enable-animations = /apps/panel/global/enable_animations drawer-autoclose = /apps/panel/global/drawer_autoclose diff --git a/mate-panel/panel-layout.c b/mate-panel/panel-layout.c index d86bcd39..47324208 100644 --- a/mate-panel/panel-layout.c +++ b/mate-panel/panel-layout.c @@ -118,7 +118,7 @@ panel_layout_append_group_helper (GKeyFile *keyfile, const char *type_for_error_message) { gboolean retval = FALSE; - const char *id; + char *id; char *unique_id = NULL; char *path = NULL; GSettings *settings = NULL; @@ -162,6 +162,9 @@ panel_layout_append_group_helper (GKeyFile *keyfile, existing_ids = panel_dconf_list_subdirs (dconf_path, TRUE); if (id) { + if (set_screen_to > 0) { + id = g_strdup_printf ("%s-screen%d", id, set_screen_to); + } for (i = 0; existing_ids[i]; i++) { if (!strcmp (existing_ids[i], id)) { existing_id = TRUE; |