From 1bfba308a99decc96ad29fa5dcb0f708c0744628 Mon Sep 17 00:00:00 2001
From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
Date: Sat, 10 Nov 2018 23:41:58 +0100
Subject: [PATCH] Correctly initialize the primary display value

---
 src/xfce-desktop.c |  8 ++++----
 src/xfce-desktop.h | 11 +++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/xfce-desktop.c b/src/xfce-desktop.c
index a8f3af8d..dca20257 100644
--- a/src/xfce-desktop.c
+++ b/src/xfce-desktop.c
@@ -172,9 +172,6 @@ static gboolean xfce_desktop_delete_event(GtkWidget *w,
                                           GdkEventAny *evt);
 static void xfce_desktop_style_updated(GtkWidget *w);
 
-static void xfce_desktop_set_primary(XfceDesktop *desktop,
-                                     gboolean primary);
-
 static void xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop,
                                                    gboolean single_workspace);
 static void xfce_desktop_set_single_workspace_number(XfceDesktop *desktop,
@@ -276,6 +273,9 @@ xfce_desktop_setup_icon_view(XfceDesktop *desktop)
         gtk_widget_show(desktop->priv->icon_view);
         gtk_container_add(GTK_CONTAINER(desktop), desktop->priv->icon_view);
 
+        xfdesktop_icon_view_set_primary(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view),
+                                        desktop->priv->primary);
+
         if(desktop->priv->icons_style == XFCE_DESKTOP_ICON_STYLE_FILES)
             g_signal_connect(G_OBJECT(manager), "hidden-state-changed",
                              G_CALLBACK(hidden_state_changed_cb), desktop);
@@ -1684,7 +1684,7 @@ xfce_desktop_set_icon_size(XfceDesktop *desktop,
 #endif
 }
 
-static void
+void
 xfce_desktop_set_primary(XfceDesktop *desktop,
                            gboolean primary)
 {
diff --git a/src/xfce-desktop.h b/src/xfce-desktop.h
index 640b7785..8caadd2d 100644
--- a/src/xfce-desktop.h
+++ b/src/xfce-desktop.h
@@ -51,7 +51,7 @@ typedef enum
 struct _XfceDesktop
 {
     GtkWindow window;
-    
+
     /*< private >*/
     XfceDesktopPriv *priv;
 };
@@ -59,13 +59,13 @@ struct _XfceDesktop
 struct _XfceDesktopClass
 {
     GtkWindowClass parent_class;
-    
+
     /*< signals >*/
-    
+
     /* for the app menu/file context menu */
     void (*populate_root_menu)(XfceDesktop *desktop,
                                GtkMenuShell *menu);
-    
+
     /* for the windowlist menu */
     void (*populate_secondary_root_menu)(XfceDesktop *desktop,
                                          GtkMenuShell *menu);
@@ -89,6 +89,9 @@ XfceDesktopIconStyle xfce_desktop_get_icon_style(XfceDesktop *desktop);
 void xfce_desktop_set_icon_size(XfceDesktop *desktop,
                                 guint icon_size);
 
+void xfce_desktop_set_primary(XfceDesktop *desktop,
+                              gboolean primary);
+
 void xfce_desktop_set_use_icon_font_size(XfceDesktop *desktop,
                                          gboolean use_system);
 void xfce_desktop_set_icon_font_size(XfceDesktop *desktop,
-- 
2.19.1