← Back to branch summary

~ubuntu-branches/ubuntu/natty/libhildonhelp/natty

« back to all changes in this revision

Viewing changes to debian/patches/0004-gtk-widget-realized.patch

  • Committer: Bazaar Package Importer
  • Author(s): Loïc Minier
  • Date: 2010-04-19 11:48:16 UTC
  • mfrom: (3.2.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100419114816-4rm46azudg1x1mci
Tags: 2.0.5-4
http://bugs.debian.org/577339
* New patch, 0004-gtk-widget-realized, fixes FTBFS with newer Gtk+
  versions; closes: #577339
  - src/osso-helplib.c: use gtk_widget_get_realized() instead of
    GTK_WIDGET_REALIZED(); this is only available since Gtk+ 2.20.0.
  - src/hildon-help-private.h: #define gtk_widget_get_realized() to
    GTK_WIDGET_REALIZED() when available.
* Switch to @debian.org address and use utf-8
* Bump up Standards-Version to 3.8.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0004-gtk-widget-realized.patch
 
1
Index: libhildonhelp-2.0.5/src/hildon-help-private.h
 
2
===================================================================
 
3
--- libhildonhelp-2.0.5.orig/src/hildon-help-private.h  2010-04-19 11:28:00.800342626 +0200
 
4
+++ libhildonhelp-2.0.5/src/hildon-help-private.h       2010-04-19 11:34:16.270369818 +0200
 
5
@@ -49,7 +49,13 @@
 
6
 #include <string.h>
 
7
 
 
8
 #include <libosso.h>    /* osso_context_t */
 
9
-#include <gtk/gtk.h>    /* gboolean */
 
10
+#include <gtk/gtk.h>    /* gboolean, GTK_WIDGET_REALIZED() */
 
11
+
 
12
+/* Compatibility with older Gtk+ which didn't have gtk_widget_get_realized(),
 
13
+ * added in 2.20.0 */
 
14
+#ifdef GTK_WIDGET_REALIZED
 
15
+#define gtk_widget_get_realized(widget) GTK_WIDGET_REALIZED(widget)
 
16
+#endif
 
17
 
 
18
 /* --- Stuff that could come from GConf (but is not) --- */
 
19
 
 
20
Index: libhildonhelp-2.0.5/src/osso-helplib.c
 
21
===================================================================
 
22
--- libhildonhelp-2.0.5.orig/src/osso-helplib.c 2010-04-19 11:27:11.851593139 +0200
 
23
+++ libhildonhelp-2.0.5/src/osso-helplib.c      2010-04-19 11:30:09.131709183 +0200
 
24
@@ -168,7 +168,7 @@
 
25
 
 
26
     g_return_if_fail(GTK_IS_DIALOG(dialog));
 
27
 
 
28
-    if (!GTK_WIDGET_REALIZED(GTK_WIDGET(dialog))) {
 
29
+    if (!gtk_widget_get_realized(GTK_WIDGET(dialog))) {
 
30
       g_signal_handlers_disconnect_matched (dialog, G_SIGNAL_MATCH_FUNC, 0, 0, NULL, dialog_on_realize, NULL) ;
 
31
       g_signal_connect (G_OBJECT (dialog), "realize", (GCallback)dialog_on_realize, (gpointer)GINT_TO_POINTER(has_help)) ;
 
32
     } else {