[gnome-settings-daemon] xrandr: remove ApplyConfiguration DBus method

[Giovanni Campagna <gcampagna src gnome org>]

commit 4c8fa6e6a3bcaf1015e1cc437595810dc74bd4ae
Author: Giovanni Campagna <gcampagn redhat com>
Date:   Thu Aug 8 14:09:16 2013 +0200

    xrandr: remove ApplyConfiguration DBus method
    
    In the new model, the client that wants to change the display
    configuration asks mutter for the new layout directly, and that
    takes care of saving to monitors.xml or restoring the existing
    configuration if the new one fails.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=705507

 plugins/xrandr/gsd-xrandr-manager.c |   45 +----------------------------------
 1 files changed, 1 insertions(+), 44 deletions(-)
---
diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
index f8fc7de..34d7555 100644
--- a/plugins/xrandr/gsd-xrandr-manager.c
+++ b/plugins/xrandr/gsd-xrandr-manager.c
@@ -79,15 +79,6 @@ static const gchar introspection_xml[] =
 "<node name='/org/gnome/SettingsDaemon/XRANDR'>"
 "  <interface name='org.gnome.SettingsDaemon.XRANDR_2'>"
 "    <annotation name='org.freedesktop.DBus.GLib.CSymbol' value='gsd_xrandr_manager_2'/>"
-"    <method name='ApplyConfiguration'>"
-"      <!-- transient-parent window for the confirmation dialog; use 0"
-"      for no parent -->"
-"      <arg name='parent_window_id' type='x' direction='in'/>"
-""
-"      <!-- Timestamp used to present the confirmation dialog and (in"
-"      the future) for the RANDR calls themselves -->"
-"      <arg name='timestamp' type='x' direction='in'/>"
-"    </method>"
 "    <method name='VideoModeSwitch'>"
 "       <!-- Timestamp for the RANDR call itself -->"
 "       <arg name='timestamp' type='x' direction='in'/>"
@@ -733,29 +724,6 @@ out:
         return result;
 }
 
-/* DBus method for org.gnome.SettingsDaemon.XRANDR_2 ApplyConfiguration; see gsd-xrandr-manager.xml for the 
interface definition */
-static gboolean
-gsd_xrandr_manager_2_apply_configuration (GsdXrandrManager *manager,
-                                          gint64            parent_window_id,
-                                          gint64            timestamp,
-                                          GError          **error)
-{
-        GdkWindow *parent_window;
-        gboolean result;
-
-        if (parent_window_id != 0)
-                parent_window = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), (Window) 
parent_window_id);
-        else
-                parent_window = NULL;
-
-        result = try_to_apply_intended_configuration (manager, parent_window, (guint32) timestamp, error);
-
-        if (parent_window)
-                g_object_unref (parent_window);
-
-        return result;
-}
-
 /* DBus method for org.gnome.SettingsDaemon.XRANDR_2 VideoModeSwitch; see gsd-xrandr-manager.xml for the 
interface definition */
 static gboolean
 gsd_xrandr_manager_2_video_mode_switch (GsdXrandrManager *manager,
@@ -2167,21 +2135,10 @@ handle_method_call_xrandr_2 (GsdXrandrManager *manager,
                              GDBusMethodInvocation *invocation)
 {
         gint64 timestamp;
-        GError *error = NULL;
 
         g_debug ("Calling method '%s' for org.gnome.SettingsDaemon.XRANDR_2", method_name);
 
-        if (g_strcmp0 (method_name, "ApplyConfiguration") == 0) {
-                gint64 parent_window_id;
-
-                g_variant_get (parameters, "(xx)", &parent_window_id, &timestamp);
-                if (gsd_xrandr_manager_2_apply_configuration (manager, parent_window_id,
-                                                              timestamp, &error) == FALSE) {
-                        g_dbus_method_invocation_return_gerror (invocation, error);
-                } else {
-                        g_dbus_method_invocation_return_value (invocation, NULL);
-                }
-        } else if (g_strcmp0 (method_name, "VideoModeSwitch") == 0) {
+        if (g_strcmp0 (method_name, "VideoModeSwitch") == 0) {
                 g_variant_get (parameters, "(x)", &timestamp);
                 gsd_xrandr_manager_2_video_mode_switch (manager, timestamp, NULL);
                 g_dbus_method_invocation_return_value (invocation, NULL);