summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-07-09 12:42:06 +0200
committerinfirit <[email protected]>2014-11-30 18:26:14 +0100
commit2fcec22d1494b0cfb6a45dfb556847f22edec1ac (patch)
tree47b0e6d24f9bd7f8e048b1fccf5be0714f86b03c
parent849d1330149a0429bda6944a2daf0390cfae583e (diff)
downloadmate-settings-daemon-2fcec22d1494b0cfb6a45dfb556847f22edec1ac.tar.bz2
mate-settings-daemon-2fcec22d1494b0cfb6a45dfb556847f22edec1ac.tar.xz
Adapt to API changes in MateRRScreen
Based on gnome-settings-daemon commit: 3d4bb7d247ac1d70840cd7ea7247263d3f590d9f From: Giovanni Campagna <[email protected]> - mate_rr_screen_new has lost the callback parameter, replaced by "screen-changed" signal - mate_rr_screen_destroy is gone
-rw-r--r--plugins/xrandr/msd-xrandr-manager.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
index 6330d72..d93a045 100644
--- a/plugins/xrandr/msd-xrandr-manager.c
+++ b/plugins/xrandr/msd-xrandr-manager.c
@@ -2336,8 +2336,8 @@ msd_xrandr_manager_start (MsdXrandrManager *manager,
log_open ();
log_msg ("------------------------------------------------------------\nSTARTING XRANDR PLUGIN\n");
- manager->priv->rw_screen = mate_rr_screen_new (
- gdk_screen_get_default (), on_randr_event, manager, error);
+ manager->priv->rw_screen = mate_rr_screen_new (gdk_screen_get_default (), error);
+ g_signal_connect (manager->priv->rw_screen, "screen-changed", G_CALLBACK (on_randr_event), manager);
if (manager->priv->rw_screen == NULL) {
log_msg ("Could not initialize the RANDR plugin%s%s\n",
@@ -2441,7 +2441,7 @@ msd_xrandr_manager_stop (MsdXrandrManager *manager)
}
if (manager->priv->rw_screen != NULL) {
- mate_rr_screen_destroy (manager->priv->rw_screen);
+ g_object_unref (manager->priv->rw_screen);
manager->priv->rw_screen = NULL;
}