49 lines
1.9 KiB
Diff
49 lines
1.9 KiB
Diff
From 1a6952a35984a4ea19664819a0fa4b8cf7b6bf15 Mon Sep 17 00:00:00 2001
|
|
From: Richard Hughes <richard@hughsie.com>
|
|
Date: Tue, 14 Dec 2010 11:03:11 +0000
|
|
Subject: gtk3: gdk_x11_drawable_get_xid renamed to gdk_x11_window_get_xid
|
|
|
|
---
|
|
diff --git a/libcolor-glib/gcm-x11-screen.c b/libcolor-glib/gcm-x11-screen.c
|
|
index 3244721..641d651 100644
|
|
--- a/libcolor-glib/gcm-x11-screen.c
|
|
+++ b/libcolor-glib/gcm-x11-screen.c
|
|
@@ -225,7 +225,7 @@ gcm_x11_screen_assign (GcmX11Screen *screen, GdkScreen *gdk_screen, GError **err
|
|
}
|
|
|
|
priv->gdk_root = gdk_screen_get_root_window (priv->gdk_screen);
|
|
- priv->xroot = gdk_x11_drawable_get_xid (priv->gdk_root);
|
|
+ priv->xroot = gdk_x11_window_get_xid (priv->gdk_root);
|
|
priv->xdisplay = dpy;
|
|
priv->xscreen = gdk_x11_screen_get_xscreen (priv->gdk_screen);
|
|
priv->randr_event_base = event_base;
|
|
diff --git a/src/cc-color-panel.c b/src/cc-color-panel.c
|
|
index 5f54336..03f48ff 100644
|
|
--- a/src/cc-color-panel.c
|
|
+++ b/src/cc-color-panel.c
|
|
@@ -242,7 +242,7 @@ cc_color_panel_viewer_cb (GtkWidget *widget, CcColorPanel *panel)
|
|
gchar *command;
|
|
|
|
/* get xid */
|
|
- xid = gdk_x11_drawable_get_xid (gtk_widget_get_window (GTK_WIDGET (panel->priv->main_window)));
|
|
+ xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET (panel->priv->main_window)));
|
|
|
|
/* run with modal set */
|
|
command = g_strdup_printf ("%s/gcm-viewer --parent-window %u", BINDIR, xid);
|
|
diff --git a/src/gcm-utils.c b/src/gcm-utils.c
|
|
index 3f03264..c9440a7 100644
|
|
--- a/src/gcm-utils.c
|
|
+++ b/src/gcm-utils.c
|
|
@@ -156,7 +156,7 @@ gcm_utils_install_package (const gchar *package_name, GtkWindow *window)
|
|
|
|
/* get xid of this window */
|
|
if (window != NULL)
|
|
- xid = gdk_x11_drawable_get_xid (gtk_widget_get_window (GTK_WIDGET(window)));
|
|
+ xid = gdk_x11_window_get_xid (gtk_widget_get_window (GTK_WIDGET(window)));
|
|
|
|
/* we're expecting an array of packages */
|
|
packages = g_strsplit (package_name, "|", 1);
|
|
--
|
|
cgit v0.8.3.1
|
|
|