diff options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/Makefile.am | 4 | ||||
-rwxr-xr-x | gtk/abicheck.sh | 4 | ||||
-rw-r--r-- | gtk/gtk.symbols | 4 | ||||
-rw-r--r-- | gtk/gtkiconview.c | 4 | ||||
-rw-r--r-- | gtk/xdgmime/ChangeLog | 6 |
5 files changed, 15 insertions, 7 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index eb2659bba..dce232111 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -71,10 +71,10 @@ uninstall-ms-lib: endif gtk.def: gtk.symbols - (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 gtk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gtk.def + (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 $(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/\t/') > gtk.def gtkalias.h: gtk.symbols - ./makegtkalias.pl < gtk.symbols > gtkalias.h + ./makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h if OS_UNIX TESTS = abicheck.sh diff --git a/gtk/abicheck.sh b/gtk/abicheck.sh index 26b81edd9..e831a0a14 100755 --- a/gtk/abicheck.sh +++ b/gtk/abicheck.sh @@ -1,5 +1,5 @@ #! /bin/sh -cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 gtk.symbols | sed -e '/^$/d' | sort > expected-abi +cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' | sort > expected-abi nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -c12- | sort > actual-abi -diff -u expected-abi actual-abi +diff -u expected-abi actual-abi && rm expected-abi actual-abi diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 78e906706..287c111f3 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -118,6 +118,8 @@ gtk_action_is_visible gtk_action_new gtk_action_set_accel_group gtk_action_set_accel_path +gtk_action_set_sensitive +gtk_action_set_visible gtk_action_unblock_activate_from gtk_adjustment_changed gtk_adjustment_clamp_page @@ -429,6 +431,7 @@ gtk_combo_box_get_active_iter gtk_combo_box_get_active_text gtk_combo_box_get_add_tearoffs gtk_combo_box_get_column_span_column +gtk_combo_box_get_focus_on_click gtk_combo_box_get_model gtk_combo_box_get_popup_accessible gtk_combo_box_get_row_separator_func @@ -447,6 +450,7 @@ gtk_combo_box_set_active gtk_combo_box_set_active_iter gtk_combo_box_set_add_tearoffs gtk_combo_box_set_column_span_column +gtk_combo_box_set_focus_on_click gtk_combo_box_set_model gtk_combo_box_set_row_separator_func gtk_combo_box_set_row_span_column diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index b2a8dc279..66b1f831c 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -5073,7 +5073,7 @@ gtk_icon_view_accessible_model_row_deleted (GtkTreeModel *tree_model, return; } -gint +static gint gtk_icon_view_accessible_item_compare (GtkIconViewItemAccessibleInfo *i1, GtkIconViewItemAccessibleInfo *i2) { @@ -5618,7 +5618,7 @@ gtk_icon_view_accessible_get_type (void) return type; } -AtkObject * +static AtkObject * gtk_icon_view_accessible_new (GObject *obj) { AtkObject *accessible; diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog index 3ed561319..35e77df3b 100644 --- a/gtk/xdgmime/ChangeLog +++ b/gtk/xdgmime/ChangeLog @@ -1,3 +1,7 @@ +2004-08-25 Matthias Clasen <mclasen@redhat.com> + + * === Released 2.5.2 === + Wed Aug 11 20:44:35 2004 Matthias Clasen <maclas@gmx.de> * xdgmime.h (xdg_mime_shutdown): Add the XDG_PREFIX to @@ -5,7 +9,7 @@ Wed Aug 11 20:44:35 2004 Matthias Clasen <maclas@gmx.de> 2004-08-01 Matthias Clasen <mclasen@redhat.com> - * === Released 2.5.1 === + * === Released 2.5.1 === Tue Jul 20 22:24:35 2004 Matthias Clasen <maclas@gmx.de> |