Merge lp:~mterry/update-notifier/deprecations into lp:update-notifier/ubuntu

[Michael Terry]

=== modified file 'configure.in'
--- configure.in	2010-06-25 10:04:05 +0000
+++ configure.in	2010-10-05 16:40:00 +0000
@@ -12,7 +12,7 @@
 
 GNOME_COMMON_INIT
 
-pkg_modules="gtk+-2.0 gconf-2.0 dbus-glib-1 libnotify gio-2.0 x11"
+pkg_modules="gtk+-2.0 >= 2.18.0 gconf-2.0 dbus-glib-1 libnotify gio-2.0 x11"
 
 PKG_CHECK_EXISTS(gdu, [ HAVE_GDU=1 ])
 if test "x$HAVE_GDU" != "x"; then
@@ -65,6 +65,15 @@
         AC_DEFINE(ENABLE_SCP, [1], [On-demand launching of system-config-printer.])
 fi
 
+AC_ARG_ENABLE([deprecations],
+  [AS_HELP_STRING([--enable-deprecations],
+    [allow deprecated API usage @<:@default=yes@:>@])],
+  [],
+  [enable_deprecations=yes])
+AS_IF([test "x$enable_deprecations" = xno],
+  [CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE"]
+)
+
 AC_OUTPUT([
 Makefile
 src/Makefile

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-09 12:13:12 +0000
+++ debian/changelog	2010-10-05 16:40:00 +0000
@@ -1,9 +1,15 @@
 update-notifier (0.105ubuntu2) UNRELEASED; urgency=low
 
+  [ Loïc Minier ]
   * Update description to not mention adept/adept-notifier anymore, but "other
     packages" and "server use cases" as adept doesn't exist anymore.
 
- -- Loïc Minier <[e-mail]>  Thu, 09 Sep 2010 14:12:31 +0200
+  [ Michael Terry ]
+  * Add --disable-deprecations configure flag to test for deprecated API use
+  * Don't use deprecated API, and update required version of GTK+ to match
+    LP: #655231
+
+ -- Michael Terry <[e-mail]>  Tue, 05 Oct 2010 12:33:28 -0400
 
 update-notifier (0.105ubuntu1) maverick; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2010-09-09 12:13:12 +0000
+++ debian/control	2010-10-05 16:40:00 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Michael Vogt <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
-               libgtk2.0-dev (>= 2.10.0),
+               libgtk2.0-dev (>= 2.18.0),
                libgconf2-dev,
                libgdu-dev,
                libdbus-glib-1-dev (>= 0.60),

=== modified file 'src/clipboard.c'
--- src/clipboard.c	2008-10-28 13:36:50 +0000
+++ src/clipboard.c	2010-10-05 16:40:00 +0000
@@ -47,12 +47,14 @@
 	gboolean retval = FALSE;
 	GtkClipboard *clipboard;
 	Atom atom;
+	Display *display;
 
 	atom = gdk_x11_get_xatom_by_name (CLIPBOARD_NAME);
-
-	XGrabServer (GDK_DISPLAY ());
-
-	if (XGetSelectionOwner (GDK_DISPLAY (), atom) != None)
+	display = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
+
+	XGrabServer (display);
+
+	if (XGetSelectionOwner (display, atom) != None)
 		goto out;
 
 	clipboard = gtk_clipboard_get (gdk_atom_intern (CLIPBOARD_NAME, FALSE));
@@ -64,7 +66,7 @@
 		retval = TRUE;
 
 out:
-	XUngrabServer (GDK_DISPLAY ());
+	XUngrabServer (display);
 	gdk_flush ();
 
 	return retval;

=== modified file 'src/hooks.c'
--- src/hooks.c	2010-08-23 08:58:54 +0000
+++ src/hooks.c	2010-10-05 16:40:00 +0000
@@ -547,7 +547,7 @@
       return FALSE;
 
    GtkWidget *d = GTK_WIDGET (gtk_builder_get_object(priv->gtk_builder,"dialog_hooks"));
-   if((d && GTK_WIDGET_VISIBLE(d)) || priv->active_notification != NULL)
+   if((d && gtk_widget_get_visible(d)) || priv->active_notification != NULL)
       return FALSE;
 
    GdkRectangle area;

=== modified file 'src/update-notifier.c'
--- src/update-notifier.c	2010-08-23 08:58:54 +0000
+++ src/update-notifier.c	2010-10-05 16:40:00 +0000
@@ -157,7 +157,7 @@
 
    // normal launch
    context = gdk_app_launch_context_new ();
-   guint32 timestamp =  gdk_x11_get_server_time (w->window);
+   guint32 timestamp =  gdk_x11_get_server_time (gtk_widget_get_window (w));
    appinfo = g_app_info_create_from_commandline(cmd, 
 						cmd, 
 						G_APP_INFO_CREATE_NONE,