|
0 |
From: Andreas Rottmann <a.rottmann@gmx.at>
|
|
1 |
Subject: Fix build against GTK+ 2.18
|
|
2 |
Origin: vendor
|
|
3 |
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=597480
|
|
4 |
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549752
|
|
5 |
|
|
6 |
|
|
7 |
|
|
8 |
---
|
|
9 |
gtk/gnome/gw/gtk-support.c | 2 +-
|
|
10 |
gtk/gnome/gw/gtk-support.h | 2 +-
|
|
11 |
gtk/gnome/overrides/gtk.defs | 3 ++-
|
|
12 |
3 files changed, 4 insertions(+), 3 deletions(-)
|
|
13 |
|
|
14 |
diff --git a/gtk/gnome/gw/gtk-support.c b/gtk/gnome/gw/gtk-support.c
|
|
15 |
index d646667..83a563e 100644
|
|
16 |
--- a/gtk/gnome/gw/gtk-support.c
|
|
17 |
+++ b/gtk/gnome/gw/gtk-support.c
|
|
18 |
@@ -1012,7 +1012,7 @@ gtk_widget_get_window (GtkWidget *widget)
|
|
19 |
}
|
|
20 |
|
|
21 |
GdkRectangle*
|
|
22 |
-gtk_widget_get_allocation (GtkWidget *widget)
|
|
23 |
+_gtk_widget_get_allocation (GtkWidget *widget)
|
|
24 |
{
|
|
25 |
GdkRectangle *ret = g_new (GdkRectangle, 1);
|
|
26 |
*ret = widget->allocation;
|
|
27 |
diff --git a/gtk/gnome/gw/gtk-support.h b/gtk/gnome/gw/gtk-support.h
|
|
28 |
index 0326cd1..79009c0 100644
|
|
29 |
--- a/gtk/gnome/gw/gtk-support.h
|
|
30 |
+++ b/gtk/gnome/gw/gtk-support.h
|
|
31 |
@@ -117,6 +117,6 @@ void _wrap_gtk_tree_view_column_set_cell_data_func (GtkTreeViewColumn *tree_colu
|
|
32 |
guint _wrap_gtk_ui_manager_add_ui_from_string (GtkUIManager *ui, const gchar *string, GError **error);
|
|
33 |
|
|
34 |
GdkWindow* gtk_widget_get_window (GtkWidget *widget);
|
|
35 |
-GdkRectangle* gtk_widget_get_allocation (GtkWidget *widget);
|
|
36 |
+GdkRectangle* _gtk_widget_get_allocation (GtkWidget *widget);
|
|
37 |
void _wrap_gtk_drag_dest_set (GtkWidget *widget, GtkDestDefaults flags, const GList *types, GdkDragAction actions);
|
|
38 |
GtkStateType gtk_widget_get_state (GtkWidget *widget);
|
|
39 |
diff --git a/gtk/gnome/overrides/gtk.defs b/gtk/gnome/overrides/gtk.defs
|
|
40 |
index e69a5a2..e914f70 100644
|
|
41 |
--- a/gtk/gnome/overrides/gtk.defs
|
|
42 |
+++ b/gtk/gnome/overrides/gtk.defs
|
|
43 |
@@ -848,7 +848,8 @@
|
|
44 |
|
|
45 |
(define-method get-allocation
|
|
46 |
(of-object "GtkWidget")
|
|
47 |
- (c-name "gtk_widget_get_allocation")
|
|
48 |
+ (c-name "_gtk_widget_get_allocation")
|
|
49 |
+ (overrides "gtk_widget_get_allocation")
|
|
50 |
(return-type "GdkRectangle*")) ;; same as GtkAllocation
|
|
51 |
|
|
52 |
(define-method get_state
|
|
53 |
--
|
|
54 |
tg: (e3b9fd7..) fixes/gtk-2.18-build (depends on: upstream)
|