[totem] main: Remove XEmbed parenting hack
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] main: Remove XEmbed parenting hack
- Date: Wed, 30 Apr 2014 12:02:08 +0000 (UTC)
commit b52e2aa01e4dba843fc3c01f086a3ee4cc303e08
Author: Bastien Nocera <hadess hadess net>
Date: Wed Apr 30 13:58:54 2014 +0200
main: Remove XEmbed parenting hack
It was only used in the browser plugin which is now gone.
docs/reference/totem-sections.txt | 1 -
src/totem-interface.c | 65 +-----------------------------------
src/totem-interface.h | 2 -
3 files changed, 2 insertions(+), 66 deletions(-)
---
diff --git a/docs/reference/totem-sections.txt b/docs/reference/totem-sections.txt
index a33a484..7e6259a 100644
--- a/docs/reference/totem-sections.txt
+++ b/docs/reference/totem-sections.txt
@@ -114,7 +114,6 @@ totem_interface_get_license
totem_interface_load
totem_interface_load_pixbuf
totem_interface_load_with_full_path
-totem_interface_set_transient_for
</SECTION>
<SECTION>
diff --git a/src/totem-interface.c b/src/totem-interface.c
index a6930bd..6097e99 100644
--- a/src/totem-interface.c
+++ b/src/totem-interface.c
@@ -64,8 +64,8 @@ totem_interface_error_dialog (const char *title, const char *reason,
gtk_message_dialog_format_secondary_text
(GTK_MESSAGE_DIALOG (error_dialog), "%s", reason);
- totem_interface_set_transient_for (GTK_WINDOW (error_dialog),
- GTK_WINDOW (parent));
+ gtk_window_set_transient_for (GTK_WINDOW (error_dialog),
+ GTK_WINDOW (parent));
gtk_window_set_title (GTK_WINDOW (error_dialog), ""); /* as per HIG */
gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5);
gtk_dialog_set_default_response (GTK_DIALOG (error_dialog),
@@ -288,67 +288,6 @@ totem_interface_get_full_path (const char *name)
return filename;
}
-#ifdef GDK_WINDOWING_X11
-static GdkWindow *
-totem_gtk_plug_get_toplevel (GtkPlug *plug)
-{
- Window root, parent, *children;
- guint nchildren;
- Window xid;
-
- g_return_val_if_fail (GTK_IS_PLUG (plug), NULL);
-
- xid = gtk_plug_get_id (plug);
-
- do
- {
- /* FIXME: multi-head */
- if (XQueryTree (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xid, &root,
- &parent, &children, &nchildren) == 0)
- {
- g_warning ("Couldn't find window manager window");
- return NULL;
- }
-
- if (root == parent) {
- GdkWindow *toplevel;
- toplevel = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), xid);
- return toplevel;
- }
-
- xid = parent;
- }
- while (TRUE);
-}
-#endif /* GDK_WINDOWING_X11 */
-
-void
-totem_interface_set_transient_for (GtkWindow *window, GtkWindow *parent)
-{
-#ifdef GDK_WINDOWING_X11
- GdkDisplay *display;
-
- display = gdk_display_get_default ();
-
- if (GDK_IS_X11_DISPLAY (display) &&
- GTK_IS_PLUG (parent)) {
- GdkWindow *toplevel;
-
- gtk_widget_realize (GTK_WIDGET (window));
- toplevel = totem_gtk_plug_get_toplevel (GTK_PLUG (parent));
- if (toplevel != NULL) {
- gdk_window_set_transient_for
- (gtk_widget_get_window (GTK_WIDGET (window)), toplevel);
- g_object_unref (toplevel);
- }
- return;
- }
-#endif /* GDK_WINDOWING_X11 */
-
- gtk_window_set_transient_for (GTK_WINDOW (window),
- GTK_WINDOW (parent));
-}
-
/**
* totem_interface_create_header_button:
* @header: The header widget to put the button in
diff --git a/src/totem-interface.h b/src/totem-interface.h
index 707676a..4e65ab2 100644
--- a/src/totem-interface.h
+++ b/src/totem-interface.h
@@ -49,8 +49,6 @@ void totem_interface_error_with_link (const char *title,
const char *uri,
const char *label,
GtkWindow *parent);
-void totem_interface_set_transient_for (GtkWindow *window,
- GtkWindow *parent);
GtkWidget * totem_interface_create_header_button (GtkWidget *header,
GtkWidget *button,
const char *icon_name,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]