[Lsb-messages] /var/www/bzr/lsb/devel/build_env r2214: fixup broken gtk3 funcptrs + cleanup (bug 3932)

Mats Wichmann mats at linuxfoundation.org
Fri Feb 21 18:38:32 UTC 2014


------------------------------------------------------------
revno: 2214
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Fri 2014-02-21 11:38:32 -0700
message:
  fixup broken gtk3 funcptrs + cleanup (bug 3932)
modified:
  headers/All/3.1/gtk-2.0/gdk/gdk.h.defs
  headers/All/3.1/gtk-2.0/gtk/gtk.h.defs
  headers/All/3.2/gtk-2.0/gdk/gdk.h.defs
  headers/All/3.2/gtk-2.0/gtk/gtk.h.defs
  headers/All/4.0/gtk-2.0/gdk/gdk.h.defs
  headers/All/4.0/gtk-2.0/gtk/gtk.h.defs
  headers/All/4.1/gtk-2.0/gdk/gdk.h.defs
  headers/All/4.1/gtk-2.0/gtk/gtk.h.defs
  headers/All/4.1/gtk-2.0/gtk/gtkrecentfilter.h.defs
  headers/All/5.0/gtk-2.0/gdk/gdk.h.defs
  headers/All/5.0/gtk-2.0/gtk/gtk.h.defs
  headers/All/5.0/gtk-2.0/gtk/gtkrecentfilter.h.defs
  headers/All/5.0/gtk-3.0/gdk/gdk.h.defs
  headers/All/5.0/gtk-3.0/gtk/gtk.h.defs
  headers/All/5.1/gtk-2.0/gdk/gdk.h.defs
  headers/All/5.1/gtk-2.0/gtk/gtk.h.defs
  headers/All/5.1/gtk-2.0/gtk/gtkrecentfilter.h.defs
  headers/All/5.1/gtk-3.0/gdk/gdk.h.defs
  headers/All/5.1/gtk-3.0/gtk/gtk.h.defs
  headers/gtk-2.0/gdk/gdk.h
  headers/gtk-2.0/gtk/gtk.h
  headers/gtk-2.0/gtk/gtkrecentfilter.h
  headers/gtk-3.0/gdk/gdk.h
  headers/gtk-3.0/gtk/gtk.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/3.1/gtk-2.0/gdk/gdk.h.defs'
--- a/headers/All/3.1/gtk-2.0/gdk/gdk.h.defs	2010-09-21 13:38:11 +0000
+++ b/headers/All/3.1/gtk-2.0/gdk/gdk.h.defs	2014-02-21 18:38:32 +0000
@@ -842,8 +842,8 @@
     GdkEventWindowState window_state;
     GdkEventSetting setting;
 } GdkEvent;
-typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent *, GdkEvent *,
-					 gpointer);
+typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					 GdkEvent * event, gpointer data);
 typedef struct _GdkDrawable {
     GObject parent_instance;
 } GdkPixmap;

=== modified file 'headers/All/3.1/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/3.1/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
+++ b/headers/All/3.1/gtk-2.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
@@ -3799,7 +3799,8 @@
     gboolean obey_child;
     GtkAllocation center_allocation;
 } GtkAspectFrame;
-typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *, gpointer);
+typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+				      filter_info, gpointer data);
 typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
 typedef struct _GtkIMMulticontext {
     GtkIMContext object;

=== modified file 'headers/All/3.2/gtk-2.0/gdk/gdk.h.defs'
--- a/headers/All/3.2/gtk-2.0/gdk/gdk.h.defs	2010-09-21 13:38:11 +0000
+++ b/headers/All/3.2/gtk-2.0/gdk/gdk.h.defs	2014-02-21 18:38:32 +0000
@@ -842,8 +842,8 @@
     GdkEventWindowState window_state;
     GdkEventSetting setting;
 } GdkEvent;
-typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent *, GdkEvent *,
-					 gpointer);
+typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					 GdkEvent * event, gpointer data);
 typedef struct _GdkDrawable {
     GObject parent_instance;
 } GdkPixmap;

=== modified file 'headers/All/3.2/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/3.2/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
+++ b/headers/All/3.2/gtk-2.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
@@ -3799,7 +3799,8 @@
     gboolean obey_child;
     GtkAllocation center_allocation;
 } GtkAspectFrame;
-typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *, gpointer);
+typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+				      filter_info, gpointer data);
 typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
 typedef struct _GtkIMMulticontext {
     GtkIMContext object;

=== modified file 'headers/All/4.0/gtk-2.0/gdk/gdk.h.defs'
--- a/headers/All/4.0/gtk-2.0/gdk/gdk.h.defs	2010-09-21 13:38:11 +0000
+++ b/headers/All/4.0/gtk-2.0/gdk/gdk.h.defs	2014-02-21 18:38:32 +0000
@@ -842,8 +842,8 @@
     GdkEventWindowState window_state;
     GdkEventSetting setting;
 } GdkEvent;
-typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent *, GdkEvent *,
-					 gpointer);
+typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					 GdkEvent * event, gpointer data);
 typedef struct _GdkDrawable {
     GObject parent_instance;
 } GdkPixmap;

=== modified file 'headers/All/4.0/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/4.0/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
+++ b/headers/All/4.0/gtk-2.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
@@ -3802,7 +3802,8 @@
     gboolean obey_child;
     GtkAllocation center_allocation;
 } GtkAspectFrame;
-typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *, gpointer);
+typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+				      filter_info, gpointer data);
 typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
 typedef struct _GtkIMMulticontext {
     GtkIMContext object;

=== modified file 'headers/All/4.1/gtk-2.0/gdk/gdk.h.defs'
--- a/headers/All/4.1/gtk-2.0/gdk/gdk.h.defs	2010-05-11 12:20:04 +0000
+++ b/headers/All/4.1/gtk-2.0/gdk/gdk.h.defs	2014-02-21 18:38:32 +0000
@@ -842,8 +842,8 @@
     GdkEventWindowState window_state;
     GdkEventSetting setting;
 } GdkEvent;
-typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent *, GdkEvent *,
-					 gpointer);
+typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					 GdkEvent * event, gpointer data);
 typedef struct _GdkDrawable {
     GObject parent_instance;
 } GdkPixmap;

=== modified file 'headers/All/4.1/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/4.1/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
+++ b/headers/All/4.1/gtk-2.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
@@ -3935,7 +3935,8 @@
     gboolean obey_child;
     GtkAllocation center_allocation;
 } GtkAspectFrame;
-typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *, gpointer);
+typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+				      filter_info, gpointer data);
 typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
 typedef struct _GtkIMMulticontext {
     GtkIMContext object;

=== modified file 'headers/All/4.1/gtk-2.0/gtk/gtkrecentfilter.h.defs'
--- a/headers/All/4.1/gtk-2.0/gtk/gtkrecentfilter.h.defs	2010-05-05 16:10:33 +0000
+++ b/headers/All/4.1/gtk-2.0/gtk/gtkrecentfilter.h.defs	2014-02-21 18:38:32 +0000
@@ -22,8 +22,8 @@
     GTK_RECENT_FILTER_GROUP,
     GTK_RECENT_FILTER_AGE
 } GtkRecentFilterFlags;
-typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *,
-					gpointer);
+typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
+					filter_info, gpointer user_data);
 extern void gtk_recent_filter_add_age(GtkRecentFilter * filter, gint days);
 extern void gtk_recent_filter_add_application(GtkRecentFilter * filter,
 					      const char *application);

=== modified file 'headers/All/5.0/gtk-2.0/gdk/gdk.h.defs'
--- a/headers/All/5.0/gtk-2.0/gdk/gdk.h.defs	2012-05-10 10:30:41 +0000
+++ b/headers/All/5.0/gtk-2.0/gdk/gdk.h.defs	2014-02-21 18:38:32 +0000
@@ -842,8 +842,8 @@
     GdkEventWindowState window_state;
     GdkEventSetting setting;
 } GdkEvent;
-typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent *, GdkEvent *,
-					 gpointer);
+typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					 GdkEvent * event, gpointer data);
 typedef struct _GdkDrawable {
     GObject parent_instance;
 } GdkPixmap;

=== modified file 'headers/All/5.0/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/5.0/gtk-2.0/gtk/gtk.h.defs	2013-08-24 16:14:13 +0000
+++ b/headers/All/5.0/gtk-2.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
@@ -3936,7 +3936,8 @@
     gboolean obey_child;
     GtkAllocation center_allocation;
 } GtkAspectFrame;
-typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *, gpointer);
+typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+				      filter_info, gpointer data);
 typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
 typedef struct _GtkIMMulticontext {
     GtkIMContext object;

=== modified file 'headers/All/5.0/gtk-2.0/gtk/gtkrecentfilter.h.defs'
--- a/headers/All/5.0/gtk-2.0/gtk/gtkrecentfilter.h.defs	2010-05-05 16:10:33 +0000
+++ b/headers/All/5.0/gtk-2.0/gtk/gtkrecentfilter.h.defs	2014-02-21 18:38:32 +0000
@@ -22,8 +22,8 @@
     GTK_RECENT_FILTER_GROUP,
     GTK_RECENT_FILTER_AGE
 } GtkRecentFilterFlags;
-typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *,
-					gpointer);
+typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
+					filter_info, gpointer user_data);
 extern void gtk_recent_filter_add_age(GtkRecentFilter * filter, gint days);
 extern void gtk_recent_filter_add_application(GtkRecentFilter * filter,
 					      const char *application);

=== modified file 'headers/All/5.0/gtk-3.0/gdk/gdk.h.defs'
--- a/headers/All/5.0/gtk-3.0/gdk/gdk.h.defs	2014-02-21 05:14:33 +0000
+++ b/headers/All/5.0/gtk-3.0/gdk/gdk.h.defs	2014-02-21 18:38:32 +0000
@@ -316,7 +316,8 @@
     GDK_FILTER_TRANSLATE,
     GDK_FILTER_REMOVE
 } GdkFilterReturn;
-typedef GdkFilterReturn(*GdkFilterFunc) (void);
+typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					 GdkEvent * event, gpointer data);
 typedef enum {
     GDK_NOTHING,
     GDK_DELETE,
@@ -848,7 +849,8 @@
 extern GdkEvent *gdk_display_peek_event(GdkDisplay * display);
 extern gboolean gdk_display_pointer_is_grabbed(GdkDisplay * display);
 extern void gdk_display_pointer_ungrab(GdkDisplay * display, guint32);
-extern void gdk_display_put_event(GdkDisplay * display, const GdkEvent *);
+extern void gdk_display_put_event(GdkDisplay * display,
+				  const GdkEvent * event);
 extern gboolean gdk_display_request_selection_notification(GdkDisplay *
 							   display,
 							   GdkAtom);

=== modified file 'headers/All/5.0/gtk-3.0/gtk/gtk.h.defs'
--- a/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs	2013-10-31 22:48:27 +0000
+++ b/headers/All/5.0/gtk-3.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
@@ -716,9 +716,12 @@
     GTK_FILE_FILTER_DISPLAY_NAME,
     GTK_FILE_FILTER_MIME_TYPE
 } GtkFileFilterFlags;
-typedef gboolean(*GtkFileFilterFunc) (void);
+typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+				      filter_info, gpointer data);
 typedef struct _GtkThemingEngine GtkThemingEngine;
-typedef gboolean(*GtkFontFilterFunc) (void);
+typedef gboolean(*GtkFontFilterFunc) (const PangoFontFamily * family,
+				      const PangoFontFace * face,
+				      gpointer data);
 typedef struct _GtkFontChooser GtkFontChooser;
 typedef struct _GtkAppChooserButton GtkAppChooserButton;
 typedef struct _GtkMountOperation GtkMountOperation;
@@ -773,7 +776,8 @@
 typedef struct _GtkRecentFilterInfo GtkRecentFilterInfo;
 typedef enum
     GtkRecentFilterFlags;
-typedef gboolean(*GtkRecentFilterFunc) (void);
+typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
+					filter_info, gpointer user_data);
 typedef struct _GtkSwitch GtkSwitch;
 typedef enum {
     GTK_CELL_RENDERER_SELECTED,

=== modified file 'headers/All/5.1/gtk-2.0/gdk/gdk.h.defs'
--- a/headers/All/5.1/gtk-2.0/gdk/gdk.h.defs	2014-02-20 15:21:52 +0000
+++ b/headers/All/5.1/gtk-2.0/gdk/gdk.h.defs	2014-02-21 18:38:32 +0000
@@ -842,8 +842,8 @@
     GdkEventWindowState window_state;
     GdkEventSetting setting;
 } GdkEvent;
-typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent *, GdkEvent *,
-					 gpointer);
+typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					 GdkEvent * event, gpointer data);
 typedef struct _GdkDrawable {
     GObject parent_instance;
 } GdkPixmap;

=== modified file 'headers/All/5.1/gtk-2.0/gtk/gtk.h.defs'
--- a/headers/All/5.1/gtk-2.0/gtk/gtk.h.defs	2014-02-20 15:21:52 +0000
+++ b/headers/All/5.1/gtk-2.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
@@ -3936,7 +3936,8 @@
     gboolean obey_child;
     GtkAllocation center_allocation;
 } GtkAspectFrame;
-typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *, gpointer);
+typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+				      filter_info, gpointer data);
 typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
 typedef struct _GtkIMMulticontext {
     GtkIMContext object;

=== modified file 'headers/All/5.1/gtk-2.0/gtk/gtkrecentfilter.h.defs'
--- a/headers/All/5.1/gtk-2.0/gtk/gtkrecentfilter.h.defs	2014-02-20 15:21:52 +0000
+++ b/headers/All/5.1/gtk-2.0/gtk/gtkrecentfilter.h.defs	2014-02-21 18:38:32 +0000
@@ -22,8 +22,8 @@
     GTK_RECENT_FILTER_GROUP,
     GTK_RECENT_FILTER_AGE
 } GtkRecentFilterFlags;
-typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *,
-					gpointer);
+typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
+					filter_info, gpointer user_data);
 extern void gtk_recent_filter_add_age(GtkRecentFilter * filter, gint days);
 extern void gtk_recent_filter_add_application(GtkRecentFilter * filter,
 					      const char *application);

=== modified file 'headers/All/5.1/gtk-3.0/gdk/gdk.h.defs'
--- a/headers/All/5.1/gtk-3.0/gdk/gdk.h.defs	2014-02-21 05:14:33 +0000
+++ b/headers/All/5.1/gtk-3.0/gdk/gdk.h.defs	2014-02-21 18:38:32 +0000
@@ -316,7 +316,8 @@
     GDK_FILTER_TRANSLATE,
     GDK_FILTER_REMOVE
 } GdkFilterReturn;
-typedef GdkFilterReturn(*GdkFilterFunc) (void);
+typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					 GdkEvent * event, gpointer data);
 typedef enum {
     GDK_NOTHING,
     GDK_DELETE,
@@ -848,7 +849,8 @@
 extern GdkEvent *gdk_display_peek_event(GdkDisplay * display);
 extern gboolean gdk_display_pointer_is_grabbed(GdkDisplay * display);
 extern void gdk_display_pointer_ungrab(GdkDisplay * display, guint32);
-extern void gdk_display_put_event(GdkDisplay * display, const GdkEvent *);
+extern void gdk_display_put_event(GdkDisplay * display,
+				  const GdkEvent * event);
 extern gboolean gdk_display_request_selection_notification(GdkDisplay *
 							   display,
 							   GdkAtom);

=== modified file 'headers/All/5.1/gtk-3.0/gtk/gtk.h.defs'
--- a/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs	2014-02-20 15:21:52 +0000
+++ b/headers/All/5.1/gtk-3.0/gtk/gtk.h.defs	2014-02-21 18:38:32 +0000
@@ -716,9 +716,12 @@
     GTK_FILE_FILTER_DISPLAY_NAME,
     GTK_FILE_FILTER_MIME_TYPE
 } GtkFileFilterFlags;
-typedef gboolean(*GtkFileFilterFunc) (void);
+typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+				      filter_info, gpointer data);
 typedef struct _GtkThemingEngine GtkThemingEngine;
-typedef gboolean(*GtkFontFilterFunc) (void);
+typedef gboolean(*GtkFontFilterFunc) (const PangoFontFamily * family,
+				      const PangoFontFace * face,
+				      gpointer data);
 typedef struct _GtkFontChooser GtkFontChooser;
 typedef struct _GtkAppChooserButton GtkAppChooserButton;
 typedef struct _GtkMountOperation GtkMountOperation;
@@ -773,7 +776,8 @@
 typedef struct _GtkRecentFilterInfo GtkRecentFilterInfo;
 typedef enum
     GtkRecentFilterFlags;
-typedef gboolean(*GtkRecentFilterFunc) (void);
+typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
+					filter_info, gpointer user_data);
 typedef struct _GtkSwitch GtkSwitch;
 typedef enum {
     GTK_CELL_RENDERER_SELECTED,

=== modified file 'headers/gtk-2.0/gdk/gdk.h'
--- a/headers/gtk-2.0/gdk/gdk.h	2013-10-01 21:15:51 +0000
+++ b/headers/gtk-2.0/gdk/gdk.h	2014-02-21 18:38:32 +0000
@@ -640,8 +640,9 @@
 
     typedef union _GdkEvent GdkEvent;
 
-    typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent *, GdkEvent *,
-					     gpointer);
+    typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					     GdkEvent * event,
+					     gpointer data);
 
     typedef struct _GdkDrawable GdkPixmap;
 

=== modified file 'headers/gtk-2.0/gtk/gtk.h'
--- a/headers/gtk-2.0/gtk/gtk.h	2013-10-01 21:15:51 +0000
+++ b/headers/gtk-2.0/gtk/gtk.h	2014-02-21 18:38:32 +0000
@@ -2917,8 +2917,8 @@
 
     typedef struct _GtkAspectFrame GtkAspectFrame;
 
-    typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *,
-					  gpointer);
+    typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+					  filter_info, gpointer data);
 
     typedef struct _GtkIMMulticontextPrivate GtkIMMulticontextPrivate;
 

=== modified file 'headers/gtk-2.0/gtk/gtkrecentfilter.h'
--- a/headers/gtk-2.0/gtk/gtkrecentfilter.h	2010-05-05 16:10:33 +0000
+++ b/headers/gtk-2.0/gtk/gtkrecentfilter.h	2014-02-21 18:38:32 +0000
@@ -29,8 +29,9 @@
 	GTK_RECENT_FILTER_AGE
     } GtkRecentFilterFlags;
 
-    typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *,
-					    gpointer);
+    typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
+					    filter_info,
+					    gpointer user_data);
 
     struct _GtkRecentFilterInfo {
 	GtkRecentFilterFlags contains;

=== modified file 'headers/gtk-3.0/gdk/gdk.h'
--- a/headers/gtk-3.0/gdk/gdk.h	2014-02-21 05:14:33 +0000
+++ b/headers/gtk-3.0/gdk/gdk.h	2014-02-21 18:38:32 +0000
@@ -338,7 +338,9 @@
 	GDK_FILTER_REMOVE
     } GdkFilterReturn;
 
-    typedef GdkFilterReturn(*GdkFilterFunc) (void);
+    typedef GdkFilterReturn(*GdkFilterFunc) (GdkXEvent * xevent,
+					     GdkEvent * event,
+					     gpointer data);
 
     typedef enum {
 	GDK_NOTHING,
@@ -933,7 +935,7 @@
     extern gboolean gdk_display_pointer_is_grabbed(GdkDisplay * display);
     extern void gdk_display_pointer_ungrab(GdkDisplay * display, guint32);
     extern void gdk_display_put_event(GdkDisplay * display,
-				      const GdkEvent *);
+				      const GdkEvent * event);
     extern gboolean gdk_display_request_selection_notification(GdkDisplay *
 							       display,
 							       GdkAtom);

=== modified file 'headers/gtk-3.0/gtk/gtk.h'
--- a/headers/gtk-3.0/gtk/gtk.h	2013-10-31 22:48:27 +0000
+++ b/headers/gtk-3.0/gtk/gtk.h	2014-02-21 18:38:32 +0000
@@ -827,11 +827,14 @@
 	GTK_FILE_FILTER_MIME_TYPE
     } GtkFileFilterFlags;
 
-    typedef gboolean(*GtkFileFilterFunc) (void);
+    typedef gboolean(*GtkFileFilterFunc) (const GtkFileFilterInfo *
+					  filter_info, gpointer data);
 
     typedef struct _GtkThemingEngine GtkThemingEngine;
 
-    typedef gboolean(*GtkFontFilterFunc) (void);
+    typedef gboolean(*GtkFontFilterFunc) (const PangoFontFamily * family,
+					  const PangoFontFace * face,
+					  gpointer data);
 
     typedef struct _GtkFontChooser GtkFontChooser;
 
@@ -917,7 +920,9 @@
     typedef enum
 	GtkRecentFilterFlags;
 
-    typedef gboolean(*GtkRecentFilterFunc) (void);
+    typedef gboolean(*GtkRecentFilterFunc) (const GtkRecentFilterInfo *
+					    filter_info,
+					    gpointer user_data);
 
     typedef struct _GtkSwitch GtkSwitch;
 

=== modified file 'package/Makefile'
--- a/package/Makefile	2014-02-21 05:14:33 +0000
+++ b/package/Makefile	2014-02-21 18:38:32 +0000
@@ -46,11 +46,11 @@
 # Should have leading "."
 # a big number (80-99) is leading up to the next minor spec
 # build_env is version-independent so can wait till late to bump this
-SUB_VERSION=.69
+SUB_VERSION=.70
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=3
+RPM_PACKAGE_RELEASE=1
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)



More information about the lsb-messages mailing list