[gnome-settings-daemon/gnome-3-8] media-keys: Remove the old OSD implementation

[Florian Müllner <fmuellner src gnome org>]

commit 71eca2672dd43b676353d019130a7593db82281c
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Mar 2 18:24:40 2013 +0100

    media-keys: Remove the old OSD implementation
    
    https://bugzilla.gnome.org/show_bug.cgi?id=695021

 plugins/media-keys/Makefile.am                 |   37 -
 plugins/media-keys/gsd-media-keys-manager.c    |   62 --
 plugins/media-keys/gsd-osd-window-private.h    |   72 --
 plugins/media-keys/gsd-osd-window.c            |  948 ------------------------
 plugins/media-keys/gsd-osd-window.h            |   92 ---
 plugins/media-keys/test-media-window-clutter.c |   98 ---
 plugins/media-keys/test-media-window.c         |  163 ----
 7 files changed, 0 insertions(+), 1472 deletions(-)
---
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 876bb5b..51e99db 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -32,9 +32,6 @@ libmedia_keys_la_SOURCES =            \
        gsd-media-keys-plugin.c         \
        gsd-media-keys-manager.h        \
        gsd-media-keys-manager.c        \
-       gsd-osd-window.c                \
-       gsd-osd-window.h                \
-       gsd-osd-window-private.h        \
        gsd-screenshot-utils.h          \
        gsd-screenshot-utils.c          \
        shortcuts-list.h                \
@@ -74,44 +71,11 @@ plugin_in_files =           \
 
 plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
 
-noinst_PROGRAMS = test-media-window
-
-test_media_window_SOURCES =                    \
-       gsd-osd-window.c                        \
-       gsd-osd-window.h                        \
-       gsd-osd-window-private.h                \
-       test-media-window.c                     \
-       $(NULL)
-
-test_media_window_CPPFLAGS = \
-       -I$(top_srcdir)/data/                                   \
-       -I$(top_srcdir)/gnome-settings-daemon                   \
-       -I$(top_srcdir)/plugins/common                          \
-       -I$(top_srcdir)/plugins/media-keys/gvc                  \
-       -DDATADIR=\""$(datadir)"\"                              \
-       -DPIXMAPDIR=\""$(pkgdatadir)"\"                         \
-       -DGTKBUILDERDIR=\""$(pkgdatadir)"\"                     \
-       -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"      \
-       $(AM_CPPFLAGS)
-
-test_media_window_CFLAGS = \
-       $(SETTINGS_PLUGIN_CFLAGS)       \
-       $(AM_CFLAGS)
-
-test_media_window_LDADD = \
-       $(top_builddir)/plugins/common/libcommon.la                     \
-       $(SETTINGS_DAEMON_LIBS)                 \
-       $(SETTINGS_PLUGIN_LIBS)                 \
-       -lm
-
 libexec_PROGRAMS = gsd-test-media-keys
 
 gsd_test_media_keys_SOURCES =                  \
        gsd-media-keys-manager.c                \
        gsd-media-keys-manager.h                \
-       gsd-osd-window.c                        \
-       gsd-osd-window.h                        \
-       gsd-osd-window-private.h                \
        gsd-screenshot-utils.h                  \
        gsd-screenshot-utils.c                  \
        test-media-keys.c                       \
@@ -147,7 +111,6 @@ gsd_test_media_keys_LDADD = \
 EXTRA_DIST =                           \
        gsd-marshal.list                \
        README.media-keys-API           \
-       test-media-window-clutter.c     \
        org.gnome.ShellKeyGrabber.xml   \
        $(plugin_in_files)
 
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index 2b953cd..3d1f95b 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -53,7 +53,6 @@
 
 #include "shortcuts-list.h"
 #include "shell-key-grabber.h"
-#include "gsd-osd-window.h"
 #include "gsd-screenshot-utils.h"
 #include "gsd-input-helper.h"
 #include "gsd-enums.h"
@@ -150,7 +149,6 @@ struct GsdMediaKeysManagerPrivate
         GUdevClient     *udev_client;
 #endif /* HAVE_GUDEV */
 
-        GtkWidget       *dialog;
         GSettings       *settings;
         GHashTable      *custom_settings;
 
@@ -177,8 +175,6 @@ struct GsdMediaKeysManagerPrivate
         GDBusProxy      *logind_proxy;
         gint             inhibit_keys_fd;
 
-        GdkScreen       *screen;
-
         GList           *media_players;
 
         GDBusNodeInfo   *introspection_data;
@@ -343,20 +339,6 @@ execute (GsdMediaKeysManager *manager,
         g_free (exec);
 }
 
-static void
-dialog_init (GsdMediaKeysManager *manager)
-{
-        if (manager->priv->dialog != NULL
-            && !gsd_osd_window_is_valid (GSD_OSD_WINDOW (manager->priv->dialog))) {
-                gtk_widget_destroy (manager->priv->dialog);
-                manager->priv->dialog = NULL;
-        }
-
-        if (manager->priv->dialog == NULL) {
-                manager->priv->dialog = gsd_osd_window_new ();
-        }
-}
-
 static char *
 get_key_string (GsdMediaKeysManager *manager,
                MediaKey            *key)
@@ -818,47 +800,6 @@ init_kbd (GsdMediaKeysManager *manager)
 }
 
 static void
-dialog_show (GsdMediaKeysManager *manager)
-{
-        int            orig_w;
-        int            orig_h;
-        int            screen_w;
-        int            screen_h;
-        int            x;
-        int            y;
-        GdkRectangle   geometry;
-        int            monitor;
-
-        gtk_window_set_screen (GTK_WINDOW (manager->priv->dialog),
-                               manager->priv->screen);
-
-        /*
-         * get the window size
-         * if the window hasn't been mapped, it doesn't necessarily
-         * know its true size, yet, so we need to jump through hoops
-         */
-        gtk_window_get_default_size (GTK_WINDOW (manager->priv->dialog), &orig_w, &orig_h);
-
-        monitor = gdk_screen_get_primary_monitor (manager->priv->screen);
-
-        gdk_screen_get_monitor_geometry (manager->priv->screen,
-                                         monitor,
-                                         &geometry);
-
-        screen_w = geometry.width;
-        screen_h = geometry.height;
-
-        x = ((screen_w - orig_w) / 2) + geometry.x;
-        y = geometry.y + (screen_h / 2) + (screen_h / 2 - orig_h) / 2;
-
-        gtk_window_move (GTK_WINDOW (manager->priv->dialog), x, y);
-
-        gtk_widget_show (manager->priv->dialog);
-
-        gdk_display_sync (gdk_screen_get_display (manager->priv->screen));
-}
-
-static void
 launch_app (GAppInfo *app_info,
            gint64    timestamp)
 {
@@ -2347,8 +2288,6 @@ start_media_keys_idle_cb (GsdMediaKeysManager *manager)
        }
        manager->priv->icon_theme = g_settings_get_string (manager->priv->interface_settings, "icon-theme");
 
-        manager->priv->screen = gdk_display_get_screen (gdk_display_get_default (), 0);
-
         ensure_cancellable (&manager->priv->grab_cancellable);
         shell_key_grabber_proxy_new_for_bus (G_BUS_TYPE_SESSION,
                                              G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
@@ -2460,7 +2399,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
         g_clear_object (&priv->sink);
         g_clear_object (&priv->source);
         g_clear_object (&priv->volume);
-        g_clear_object (&priv->dialog);
 
         if (priv->media_players != NULL) {
                 g_list_free_full (priv->media_players, (GDestroyNotify) free_media_player);