summaryrefslogtreecommitdiff
path: root/mate-panel/panel-layout.c
diff options
context:
space:
mode:
authormuesli4 <[email protected]>2013-04-10 15:49:44 +0200
committermuesli4 <[email protected]>2013-04-10 15:49:44 +0200
commit9201a7cebc456d2e3ce98bd478f75d0c2b223d70 (patch)
tree53a6d40d40e594e71ecc861c705f48cbe53fbc49 /mate-panel/panel-layout.c
parentec3bedb24f64944c0874dec793ba1ea9cb1b777b (diff)
parentf4a927c268231fdd6b5a333d0c547b46a11af858 (diff)
downloadmate-panel-9201a7cebc456d2e3ce98bd478f75d0c2b223d70.tar.bz2
mate-panel-9201a7cebc456d2e3ce98bd478f75d0c2b223d70.tar.xz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mate-panel/panel-layout.c')
-rw-r--r--mate-panel/panel-layout.c5
1 files changed, 4 insertions, 1 deletions
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;