diff options
author | Stefano Karapetsas <[email protected]> | 2012-02-27 08:49:53 -0800 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2012-02-27 08:49:53 -0800 |
commit | a863fa94d275584bdd7daf4de463323fde4b91c8 (patch) | |
tree | 08e39fcc6441359674c5b30f59d332195d743138 /mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c | |
parent | d7851474e28e1aa65cbdabe0d3b4032afc7d40f3 (diff) | |
parent | 5fcd54e8b74acf364cc348850f69a1a416b89692 (diff) | |
download | mate-panel-a863fa94d275584bdd7daf4de463323fde4b91c8.tar.bz2 mate-panel-a863fa94d275584bdd7daf4de463323fde4b91c8.tar.xz |
Merge pull request #10 from brianjmurrell/master
Fix for mate-panel issue #9
Diffstat (limited to 'mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c')
-rw-r--r-- | mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c index b2e90e73..3a694773 100644 --- a/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c +++ b/mate-panel/libmate-panel-applet-private/mate-panel-applet-frame-dbus.c @@ -411,6 +411,7 @@ mate_panel_applet_frame_dbus_load (const gchar *iid, MatePanelAppletFrameDBus *dbus_frame; MatePanelAppletFrame *frame; GVariantBuilder builder; + GdkScreen *screen; gchar *conf_path; gchar *background; guint orient; @@ -425,6 +426,7 @@ mate_panel_applet_frame_dbus_load (const gchar *iid, frame = MATE_PANEL_APPLET_FRAME (dbus_frame); _mate_panel_applet_frame_set_iid (frame, iid); + screen = panel_applet_frame_activating_get_screen (frame_act); orient = get_mate_panel_applet_orient (mate_panel_applet_frame_activating_get_orientation (frame_act)); conf_path = mate_panel_applet_frame_activating_get_conf_path (frame_act); /* we can't really get a background string at this point since we don't @@ -456,7 +458,7 @@ mate_panel_applet_frame_dbus_load (const gchar *iid, g_object_set_data (G_OBJECT (frame), "mate-panel-applet-frame-activating", frame_act); mate_panel_applet_container_add (dbus_frame->priv->container, - iid, NULL, + screen, iid, NULL, (GAsyncReadyCallback) mate_panel_applet_frame_dbus_activated, frame, g_variant_builder_end (&builder)); |