[tomboy] Fix libtomboy build with -DGSEAL_ENABLE



commit 33e76b94e332606b2798e458fa638f2f7a43f599
Author: Sandy Armstrong <sanfordarmstrong gmail com>
Date:   Mon May 3 12:13:08 2010 -0700

    Fix libtomboy build with -DGSEAL_ENABLE
    
    https://bugzilla.gnome.org/show_bug.cgi?id=616195

 libtomboy/Makefile.am  |    4 +++-
 libtomboy/tomboyutil.c |    8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/libtomboy/Makefile.am b/libtomboy/Makefile.am
index 8074923..57bbc1d 100644
--- a/libtomboy/Makefile.am
+++ b/libtomboy/Makefile.am
@@ -1,6 +1,8 @@
 
 if HAS_GTK_2_20
-EXTRA_FLAGS = -DHAS_GTK_2_20
+EXTRA_FLAGS = 				\
+	-DHAS_GTK_2_20			\
+	-DGSEAL_ENABLE
 endif
 
 INCLUDES = 				\
diff --git a/libtomboy/tomboyutil.c b/libtomboy/tomboyutil.c
index 162e4a2..2987aa6 100644
--- a/libtomboy/tomboyutil.c
+++ b/libtomboy/tomboyutil.c
@@ -43,7 +43,7 @@
 gint
 tomboy_window_get_workspace (GtkWindow *window)
 {
-	GdkWindow *gdkwin = GTK_WIDGET (window)->window;
+	GdkWindow *gdkwin = gtk_widget_get_window (GTK_WIDGET (window));
 	GdkAtom wm_desktop = gdk_atom_intern ("_NET_WM_DESKTOP", FALSE);
 	GdkAtom out_type;
 	gint out_format, out_length;
@@ -70,7 +70,7 @@ tomboy_window_get_workspace (GtkWindow *window)
 void
 tomboy_window_move_to_current_workspace (GtkWindow *window)
 {
-	GdkWindow *gdkwin = GTK_WIDGET (window)->window;
+	GdkWindow *gdkwin = gtk_widget_get_window (GTK_WIDGET (window));
 	GdkWindow *rootwin = 
 		gdk_screen_get_root_window (gdk_drawable_get_screen (gdkwin));
 
@@ -143,11 +143,11 @@ tomboy_window_override_user_time (GtkWindow *window)
 		 * NOTE: Last resort for D-BUS or other non-interactive
 		 *       openings.  Causes roundtrip to server.  Lame. 
 		 */
-		ev_time = gdk_x11_get_server_time (GTK_WIDGET(window)->window);
+		ev_time = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window)));
 	}
 
 	TRACE (g_print("Setting _NET_WM_USER_TIME to: %d\n", ev_time));
-	gdk_x11_window_set_user_time (GTK_WIDGET(window)->window, ev_time);
+	gdk_x11_window_set_user_time (gtk_widget_get_window (GTK_WIDGET (window)), ev_time);
 }
 
 void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]