gnome-settings-daemon r391 - in trunk: . plugins/xrandr

[ssp svn gnome org]

Author: ssp
Date: Wed Jul  9 15:50:25 2008
New Revision: 391
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=391&view=rev

Log:
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 390)
+++ ChangeLog	(working copy)
@@ -1,3 +1,8 @@
+Wed Jul  9 11:48:02 2008  SÃren Sandmann  <sandmann redhat com>
+
+	* plugins/xrandr/gsd-xrandr-manager.c: Call the new gnome_rr
+	functions instead of the old ones.
+



Modified:
   trunk/ChangeLog
   trunk/plugins/xrandr/gsd-xrandr-manager.c

Modified: trunk/plugins/xrandr/gsd-xrandr-manager.c
==============================================================================
--- trunk/plugins/xrandr/gsd-xrandr-manager.c	(original)
+++ trunk/plugins/xrandr/gsd-xrandr-manager.c	Wed Jul  9 15:50:25 2008
@@ -109,7 +109,7 @@
         if (ev->type == ClientMessage		&&
             ev->xclient.message_type == gnome_randr_xatom()) {
                 
-                configuration_apply_stored (screen);
+                gnome_rr_config_apply_stored (screen);
                 
                 return GDK_FILTER_REMOVE;
         }
@@ -137,7 +137,7 @@
                 /* FIXME: here we should cycle between valid
                  * configurations, and save them
                  */
-                configuration_apply_stored (manager->priv->rw_screen);
+                gnome_rr_config_apply_stored (manager->priv->rw_screen);
                 
                 return GDK_FILTER_CONTINUE;
         }
@@ -159,7 +159,6 @@
 static void
 popup_menu_configure_display_cb (GtkMenuItem *item, gpointer data)
 {
-        GsdXrandrManager *manager = GSD_XRANDR_MANAGER (data);
         GdkScreen *screen;
         GError *error;
 
@@ -205,7 +204,9 @@
         g_signal_connect (menu, "selection-done",
                           G_CALLBACK (gtk_widget_destroy), NULL);
 
-        gtk_menu_popup (menu, NULL, NULL, gtk_status_icon_position_menu, priv->status_icon, button, timestamp);
+        gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+                        gtk_status_icon_position_menu,
+                        priv->status_icon, button, timestamp);
 }
 
 static void
@@ -275,7 +276,7 @@
                 gdk_error_trap_pop ();
         }
         
-        configuration_apply_stored (manager->priv->rw_screen);
+        gnome_rr_config_apply_stored (manager->priv->rw_screen);
         
         gdk_window_add_filter (gdk_get_default_root_window(),
                                (GdkFilterFunc)event_filter,
@@ -393,7 +394,7 @@
         manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
 
         manager->priv->keycode = keycode;
-        manager->priv->rw_screen = rw_screen_new (
+        manager->priv->rw_screen = gnome_rr_screen_new (
                 gdk_screen_get_default(), on_randr_event, NULL);
 }