]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/libglade/libglade-2.4.0/glade-cruft.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / libglade / libglade-2.4.0 / glade-cruft.patch
1 diff -ur libglade-2.4.0~/configure.in libglade-2.4.0/configure.in
2 --- libglade-2.4.0~/configure.in        2004-05-17 12:38:31.000000000 +0100
3 +++ libglade-2.4.0/configure.in 2004-07-28 16:53:09.000000000 +0100
4 @@ -147,6 +147,18 @@
5  AM_CONDITIONAL(HAVE_PYTHON, $have_python)
6  AC_SUBST(PYTHON)
7  
8 +AC_MSG_CHECKING([for cruft in libgtk])
9 +AC_TRY_LINK([
10 +#include <gtk/gtk.h>
11 +#include <stdio.h>
12 +],      [ gtk_tree_get_type (); return 0; ],
13 +        [ AC_MSG_RESULT(yes)
14 +          have_cruft=yes ],
15 +        [ AC_MSG_RESULT(no)
16 +         AC_DEFINE(DISABLE_CRUFT,,[leave out support for old, broken widgets])
17 +          have_cruft=no ])
18 +AC_SUBST(DISABLE_CRUFT)
19 +
20  dnl add debugging options ...
21  changequote(,)dnl
22  if test "x$GCC" = xyes; then
23 Only in libglade-2.4.0: configure.in.orig
24 diff -ur libglade-2.4.0~/glade/glade-gtk.c libglade-2.4.0/glade/glade-gtk.c
25 --- libglade-2.4.0~/glade/glade-gtk.c   2004-03-13 13:47:35.000000000 +0000
26 +++ libglade-2.4.0/glade/glade-gtk.c    2004-07-28 16:53:52.000000000 +0100
27 @@ -213,6 +213,8 @@
28         gtk_clist_column_titles_hide (GTK_CLIST (w));
29  }
30  
31 +#ifndef DISABLE_CRUFT
32 +
33  static void
34  tree_set_selection_mode (GladeXML *xml, GtkWidget *w,
35                          const char *name, const char *value)
36 @@ -238,6 +240,8 @@
37      gtk_tree_set_view_lines (GTK_TREE (w), BOOL (value));
38  }
39  
40 +#endif
41 +
42  static void
43  list_set_selection_mode (GladeXML *xml, GtkWidget *w,
44                          const char *name, const char *value)
45 @@ -254,6 +258,7 @@
46      gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (w), BOOL (value));
47  }
48  
49 +#ifndef DISABLE_CRUFT
50  static void
51  text_set_text (GladeXML *xml, GtkWidget *w,
52                const char *name, const char *value)
53 @@ -262,6 +267,7 @@
54  
55      gtk_editable_insert_text (GTK_EDITABLE (w), value, -1, &pos);
56  }
57 +#endif
58  
59  static void
60  radio_menu_item_set_group (GladeXML *xml, GtkWidget *w,
61 @@ -1125,13 +1131,17 @@
62      glade_register_custom_prop (GTK_TYPE_CLIST, "selection_mode", clist_set_selection_mode);
63      glade_register_custom_prop (GTK_TYPE_CLIST, "shadow_type", clist_set_shadow_type);
64      glade_register_custom_prop (GTK_TYPE_CLIST, "show_titles", clist_set_show_titles);
65 +#ifndef DISABLE_CRUFT
66      glade_register_custom_prop (GTK_TYPE_TREE, "selection_mode", tree_set_selection_mode);
67      glade_register_custom_prop (GTK_TYPE_TREE, "view_mode", tree_set_view_mode);
68      glade_register_custom_prop (GTK_TYPE_TREE, "view_line", tree_set_view_line);
69 +#endif
70      glade_register_custom_prop (GTK_TYPE_LIST, "selection_mode", list_set_selection_mode);
71      glade_register_custom_prop (GTK_TYPE_CHECK_MENU_ITEM, "always_show_toggle",
72                                 check_menu_item_set_always_show_toggle);
73 +#ifndef DISABLE_CRUFT
74      glade_register_custom_prop (GTK_TYPE_TEXT, "text", text_set_text);
75 +#endif
76      glade_register_custom_prop (GTK_TYPE_RADIO_MENU_ITEM, "group",
77                                 radio_menu_item_set_group);
78      glade_register_custom_prop (GTK_TYPE_TOOLBAR, "tooltips", toolbar_set_tooltips);
79 @@ -1288,8 +1298,10 @@
80                            glade_standard_build_children, NULL);
81      glade_register_widget (GTK_TYPE_TEAROFF_MENU_ITEM, glade_standard_build_widget,
82                            NULL, NULL);
83 +#ifndef DISABLE_CRUFT
84      glade_register_widget (GTK_TYPE_TEXT, glade_standard_build_widget,
85                            NULL, NULL);
86 +#endif
87      glade_register_widget (GTK_TYPE_TEXT_VIEW, glade_standard_build_widget,
88                            NULL, NULL);
89      glade_register_widget (GTK_TYPE_TIPS_QUERY, glade_standard_build_widget,
90 @@ -1304,8 +1316,10 @@
91                            glade_standard_build_children, NULL);
92      glade_register_widget (GTK_TYPE_TOOL_BUTTON, glade_standard_build_widget,
93                            NULL, NULL);
94 +#ifndef DISABLE_CRUFT
95      glade_register_widget (GTK_TYPE_TREE, glade_standard_build_widget,
96                            NULL, NULL);
97 +#endif
98      glade_register_widget (GTK_TYPE_TREE_VIEW, glade_standard_build_widget,
99                            NULL, NULL);
100      glade_register_widget (GTK_TYPE_VBUTTON_BOX, glade_standard_build_widget,