From 60c2b80bf0b80db976bcf0056ca0627b97548a1e Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Thu, 20 Jan 2011 13:06:44 +0100
Subject: [broadway] Remove all leftover _gdk_windowing_ functions

---
 gdk/broadway/Makefile.am                    |  1 -
 gdk/broadway/gdkapplaunchcontext-broadway.c | 49 -----------------------------
 gdk/broadway/gdkdisplaymanager-broadway.c   |  1 +
 gdk/broadway/gdkmain-broadway.c             | 45 +-------------------------
 gdk/broadway/gdkprivate-broadway.h          |  1 +
 gdk/broadway/gdkscreen-broadway.c           |  7 -----
 6 files changed, 3 insertions(+), 101 deletions(-)
 delete mode 100644 gdk/broadway/gdkapplaunchcontext-broadway.c

diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index bcdb1416df..80ffc39c38 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -36,7 +36,6 @@ broadway_built_sources =		\
 
 libgdk_broadway_la_SOURCES =		\
 	${broadway_built_private_headers}\
-	gdkapplaunchcontext-broadway.c \
 	gdkbroadwaydisplaymanager.h	\
 	gdkcursor-broadway.c	\
 	gdkdevice-broadway.h	\
diff --git a/gdk/broadway/gdkapplaunchcontext-broadway.c b/gdk/broadway/gdkapplaunchcontext-broadway.c
deleted file mode 100644
index 911c4cf6f2..0000000000
--- a/gdk/broadway/gdkapplaunchcontext-broadway.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* gdkapplaunchcontext-broadway.c - Gtk+ implementation for GAppLaunchContext
-
-   Copyright (C) 2007 Red Hat, Inc.
-
-   The Gnome Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   The Gnome Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public
-   License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
-
-   Author: Alexander Larsson <alexl@redhat.com>
-*/
-
-#include "config.h"
-
-#include "gdkapplaunchcontext.h"
-
-#include "gdkscreen.h"
-#include "gdkinternals.h"
-#include "gdkintl.h"
-
-#include <glib.h>
-
-#include <string.h>
-#include <unistd.h>
-
-char *
-_gdk_windowing_get_startup_notify_id (GAppLaunchContext *context,
-				      GAppInfo          *info,
-				      GList             *files)
-{
-  return g_strdup ("todo");
-}
-
-
-void
-_gdk_windowing_launch_failed (GAppLaunchContext *context,
-			      const char        *startup_notify_id)
-{
-}
diff --git a/gdk/broadway/gdkdisplaymanager-broadway.c b/gdk/broadway/gdkdisplaymanager-broadway.c
index 67fa360af2..2c52a6d1be 100644
--- a/gdk/broadway/gdkdisplaymanager-broadway.c
+++ b/gdk/broadway/gdkdisplaymanager-broadway.c
@@ -103,6 +103,7 @@ gdk_broadway_display_manager_keyval_convert_case (GdkDisplayManager *manager,
 static void
 gdk_broadway_display_manager_init (GdkBroadwayDisplayManager *manager)
 {
+  _gdk_broadway_windowing_init ();
 }
 
 static void
diff --git a/gdk/broadway/gdkmain-broadway.c b/gdk/broadway/gdkmain-broadway.c
index d7b115b765..f7a2817ec6 100644
--- a/gdk/broadway/gdkmain-broadway.c
+++ b/gdk/broadway/gdkmain-broadway.c
@@ -39,51 +39,8 @@
 #include <limits.h>
 #include <errno.h>
 
-typedef struct _GdkPredicate        GdkPredicate;
-typedef struct _GdkGlobalErrorTrap  GdkGlobalErrorTrap;
-
-struct _GdkPredicate
-{
-  GdkEventFunc func;
-  gpointer data;
-};
-
-/* Private variable declarations
- */
-const GOptionEntry _gdk_windowing_args[] = {
-  { NULL }
-};
-
 void
-_gdk_windowing_init (void)
+_gdk_broadway_windowing_init (void)
 {
   _gdk_broadway_initialize_locale ();
 }
-
-GdkGrabStatus
-_gdk_windowing_device_grab (GdkDevice    *device,
-                            GdkWindow    *window,
-                            GdkWindow    *native,
-                            gboolean      owner_events,
-                            GdkEventMask  event_mask,
-                            GdkWindow    *confine_to,
-                            GdkCursor    *cursor,
-                            guint32       time)
-{
-  return GDK_GRAB_NOT_VIEWABLE;
-}
-
-void
-_gdk_windowing_display_set_sm_client_id (GdkDisplay  *display,
-					 const gchar *sm_client_id)
-{
-  if (display->closed)
-    return;
- }
-
-/* Close all open displays
- */
-void
-_gdk_windowing_exit (void)
-{
-}
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index e5cbac585d..d0ee88c337 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -42,6 +42,7 @@
 #include "gdkbroadwaywindow.h"
 
 void _gdk_broadway_resync_windows (void);
+void _gdk_broadway_windowing_init (void);
 
 gchar * _gdk_broadway_display_manager_get_atom_name (GdkDisplayManager *manager,
 						     GdkAtom atom);
diff --git a/gdk/broadway/gdkscreen-broadway.c b/gdk/broadway/gdkscreen-broadway.c
index dd1e38c5c7..9df7199548 100644
--- a/gdk/broadway/gdkscreen-broadway.c
+++ b/gdk/broadway/gdkscreen-broadway.c
@@ -286,13 +286,6 @@ _gdk_broadway_screen_events_init (GdkScreen *screen)
 {
 }
 
-gchar *
-_gdk_windowing_substitute_screen_number (const gchar *display_name,
-					 gint         screen_number)
-{
-  return g_strdup ("browser");
-}
-
 static void
 gdk_broadway_screen_class_init (GdkBroadwayScreenClass *klass)
 {
-- 
cgit v1.2.1