daemonratte/gtk2-ng
Watch
1
0
Fork
You've already forked gtk2-ng
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit a patch by Behdad to fix typos, omissions and other errors in the

Browse source 
2006-09-10  Matthias Clasen  <mclasen@redhat.com>

        * Commit a patch by Behdad to fix typos, omissions and other
        errors in the symbol aliasing, and add checks for local PLT
        entries.  (#354687, Behdad Esfahbod)
This commit is contained in:
Matthias Clasen 2006-09-10 06:39:16 +00:00 • committed by Matthias Clasen
commit f45a35921a
67 changed files with 215 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,5 +1,9 @@
2006-09-10 Matthias Clasen <mclasen@redhat.com>
* Commit a patch by Behdad to fix typos, omissions and other
errors in the symbol aliasing, and add checks for local PLT
entries. (#354687, Behdad Esfahbod)
* gtk/gtktreeview.c (gtk_tree_view_search_scroll_event): Renew
the flush timeout. (#354043, Nelson Benitez)

3
gdk-pixbuf/Makefile.am
View file

@ -50,7 +50,7 @@ gdk-pixbuf-aliasdef.c: gdk-pixbuf.symbols
$(PERL) $(srcdir)/makegdkpixbufalias.pl -def < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-aliasdef.c
if OS_LINUX
TESTS = abicheck.sh
TESTS = abicheck.sh pltcheck.sh
endif
lib_LTLIBRARIES = \
@ -273,7 +273,6 @@ INCLUDES = \
-DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
-DGTK_VERSION=\"$(GTK_VERSION)\" \
-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGTK_PREFIX=\"$(prefix)\" \
$(INCLUDED_LOADER_DEFINE) \
$(GTK_DEBUG_FLAGS) \

2
gdk-pixbuf/abicheck.sh
View file

@ -2,4 +2,4 @@
cpp -DINCLUDE_VARIABLES -P -DALL_FILES ${srcdir:-.}/gdk-pixbuf.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
nm -D -g --defined-only .libs/libgdk_pixbuf-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

4
gdk-pixbuf/gdk-pixbuf-io.c
View file

@ -2277,7 +2277,3 @@ gdk_pixbuf_get_formats (void)
#define __GDK_PIXBUF_IO_C__
#include "gdk-pixbuf-aliasdef.c"

9
gdk-pixbuf/gdk-pixbuf.c
View file

@ -30,6 +30,9 @@
#define GDK_PIXBUF_COMPILATION
#include "gdk-pixbuf.h"
#include "gdk-pixbuf-private.h"
/* Include the marshallers */
#include <glib-object.h>
#include "gdk-pixbuf-marshal.c"
#include "gdk-pixbuf-alias.h"
static void gdk_pixbuf_finalize (GObject *object);
@ -753,11 +756,5 @@ gdk_pixbuf_get_property (GObject *object,
}
}
/* Include the marshallers */
#include <glib-object.h>
#include "gdk-pixbuf-marshal.c"
#define __GDK_PIXBUF_C__
#include "gdk-pixbuf-aliasdef.c"

2
gdk-pixbuf/gdk-pixdata.c
View file

@ -17,9 +17,9 @@
* Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include "gdk-pixdata.h"
#include "gdk-pixbuf-private.h"
#include "gdk-pixdata.h"
#include "gdk-pixbuf-alias.h"
#include <string.h>

17
gdk-pixbuf/pltcheck.sh Executable file
View file

@ -0,0 +1,17 @@
#!/bin/sh
LANG=C
status=0
if ! which readelf 2>/dev/null >/dev/null; then
echo "'readelf' not found; skipping test"
exit 0
fi
for so in .libs/libgdk_pixbuf*.so; do
echo Checking $so for local PLT entries
readelf -r $so | grep 'JU\?MP_SLOT' | grep 'gdk_pixbuf' && status=1
done
exit $status

3
gdk/Makefile.am
View file

@ -25,7 +25,6 @@ INCLUDES = \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)
@ -199,7 +198,7 @@ gdkaliasdef.c: gdk.symbols
$(PERL) $(srcdir)/makegdkalias.pl -def < $(srcdir)/gdk.symbols > gdkaliasdef.c
if OS_LINUX
TESTS = abicheck.sh
TESTS = pltcheck.sh abicheck.sh
endif

2
gdk/abicheck.sh
View file

@ -2,4 +2,4 @@
cpp -DINCLUDE_VARIABLES -P -DALL_FILES -DGDK_ENABLE_BROKEN -DGDK_WINDOWING_X11 ${srcdir:-.}/gdk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' | sort | uniq > expected-abi
nm -D -g --defined-only .libs/libgdk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

14
gdk/gdk.symbols
View file

@ -137,15 +137,12 @@ gdk_threads_set_lock_functions
#endif
#if IN_HEADER(__GDK_H__)
#if IN_FILE(__GDK_INPUT_C__)
#if IN_FILE(__GDK_EVENTS_C__)
#ifndef GDK_DISABLE_DEPRECATED
gdk_input_add
gdk_input_remove
gdk_input_add_full
#endif
#ifdef GTK_COMPILATION
gdk_input_add_full
#endif
#endif
#endif
@ -642,9 +639,6 @@ gdk_window_clear_area
gdk_window_clear_area_e
gdk_window_constrain_size
gdk_window_destroy
#ifndef GDK_DISABLE_DEPRECATED
gdk_window_destroy_notify
#endif
gdk_window_end_paint
gdk_window_foreign_new
gdk_window_freeze_updates
@ -1092,6 +1086,12 @@ gdk_synthesize_window_state
#endif
#endif
#if IN_HEADER(__GDK_PRIVATE_H__)
#if IN_FILE(__GDK_WINDOW_X11_C__)
gdk_window_destroy_notify
#endif
#endif
#ifdef GDK_WINDOWING_WIN32
#if IN_HEADER(__GDK_WIN32_H__)
#if IN_FILE(__GDK_WIN32ID_C__)

1
gdk/gdkglobals.c
View file

@ -30,6 +30,7 @@
#include "gdktypes.h"
#include "gdkprivate.h"
#include "gdkalias.h"
guint _gdk_debug_flags = 0;
gint _gdk_error_code = 0;

3
gdk/gdkpango.c
View file

@ -28,9 +28,8 @@
#include "gdkrgb.h"
#include "gdkprivate.h"
#include "gdkscreen.h"
#include "gdkalias.h"
#include "gdkintl.h"
#include "gdkalias.h"
#define GDK_INFO_KEY "gdk-info"

17
gdk/pltcheck.sh Executable file
View file

@ -0,0 +1,17 @@
#!/bin/sh
LANG=C
status=0
if ! which readelf 2>/dev/null >/dev/null; then
echo "'readelf' not found; skipping test"
exit 0
fi
for so in .libs/lib*.so; do
echo Checking $so for local PLT entries
readelf -r $so | grep 'JU\?MP_SLOT' | grep -v 'gdk_pixbuf' | grep gdk && status=1
done
exit $status

1
gdk/x11/Makefile.am
View file

@ -9,7 +9,6 @@ INCLUDES = \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
$(GTK_DEBUG_FLAGS) \
$(GDK_DEP_CFLAGS)

1
gdk/x11/gdkglobals-x11.c
View file

@ -29,6 +29,7 @@
#include "gdktypes.h"
#include "gdkprivate-x11.h"
#include "gdkalias.h"
gboolean _gdk_use_xshm = TRUE; /* used as a cmd line arg */
Display *gdk_display = NULL;

92
gtk/Makefile.am
View file

@ -33,7 +33,6 @@ INCLUDES = \
-I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_PIXBUF_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
$(GTK_DEBUG_FLAGS) \
@ -89,8 +88,15 @@ gtkalias.h: gtk.symbols
gtkaliasdef.c: gtk.symbols
$(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
check-aliases:
@$(TESTS_ENVIRONMENT) $(srcdir)/aliasfilescheck.sh
.PHONY: check-aliases
TESTS_ENVIRONMENT = gtk_all_c_sources="$(gtk_all_c_sources)"
TESTS = aliasfilescheck.sh
if OS_LINUX
TESTS = abicheck.sh
TESTS += abicheck.sh pltcheck.sh
endif
# libtool stuff: set version and export symbols for resolving
@ -319,7 +325,7 @@ gtk_unix_print_public_h_sources = \
# Installed header files without compatibility guarantees
# that are not include in gtk/gtk.h
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
gtktextlayout.h \
gtkfilesystem.h
@ -336,7 +342,11 @@ gtk_private_h_sources = \
gtkfilechooserutils.h \
gtkfilesystemmodel.h \
gtkfilesystemunix.h \
gtkhsv.h \
gtkiconcache.h \
gtkintl.h \
gtkkeyhash.h \
gtkmnemonichash.h \
gtkpathbar.h \
gtkplugprivate.h \
gtkprintoperation-private.h\
@ -348,6 +358,7 @@ gtk_private_h_sources = \
gtksequence.h \
gtksocketprivate.h \
gtktextbtree.h \
gtktextbufferserialize.h\
gtktextchildprivate.h \
gtktextiterprivate.h \
gtktextmarkprivate.h \
@ -362,7 +373,7 @@ gtk_private_h_sources = \
gtkwindow-decorate.h
# GTK+ C sources to build the library from
gtk_c_sources = \
gtk_base_c_sources = \
fnmatch.c \
gtkaboutdialog.c \
gtkaccelgroup.c \
@ -440,7 +451,6 @@ gtk_c_sources = \
gtkhscrollbar.c \
gtkhseparator.c \
gtkhsv.c \
gtkhsv.h \
gtkiconcache.c \
gtkiconfactory.c \
gtkicontheme.c \
@ -452,12 +462,10 @@ gtk_c_sources = \
gtkimmodule.c \
gtkimmulticontext.c \
gtkinputdialog.c \
gtkintl.h \
gtkinvisible.c \
gtkitem.c \
gtkitemfactory.c \
gtkkeyhash.c \
gtkkeyhash.h \
gtklabel.c \
gtklayout.c \
gtklinkbutton.c \
@ -475,7 +483,6 @@ gtk_c_sources = \
gtkmessagedialog.c \
gtkmisc.c \
gtkmnemonichash.c \
gtkmnemonichash.h \
gtkmodules.c \
gtknotebook.c \
gtkobject.c \
@ -535,14 +542,11 @@ gtk_c_sources = \
gtktextbuffer.c \
gtktextbufferrichtext.c \
gtktextbufferserialize.c\
gtktextbufferserialize.h\
gtktextchild.c \
gtktextdisplay.c \
gtktextiter.c \
gtktextiterprivate.h \
gtktextlayout.c \
gtktextmark.c \
gtktextmarkprivate.h \
gtktextsegment.c \
gtktexttag.c \
gtktexttagtable.c \
@ -584,19 +588,11 @@ gtk_c_sources = \
gtkwidget.c \
gtkwindow-decorate.c \
gtkwindow.c \
xembed.h \
$(gtk_clipboard_dnd_c_sources)
gtk_c_sources = $(gtk_base_c_sources)
gtk_all_c_sources = $(gtk_base_c_sources)
if OS_UNIX
gtk_private_h_sources += \
gtkfilesystemunix.h \
gtkprintbackend.h \
gtkprinter-private.h \
gtkprinteroption.h \
gtkprinteroptionset.h \
gtkprinteroptionwidget.h
gtk_c_sources += \
gtk_os_unix_c_sources = \
gtkfilesystemunix.c \
gtkpagesetupunixdialog.c \
gtkprinter.c \
@ -607,30 +603,51 @@ gtk_c_sources += \
gtkprintoperation-unix.c \
gtkprintunixdialog.c \
gtkprintbackend.c
gtk_all_c_sources += $(gtk_os_unix_c_sources)
if OS_UNIX
gtk_private_h_sources += \
gtkfilesystemunix.h \
gtkprintbackend.h \
gtkprinter-private.h \
gtkprinteroption.h \
gtkprinteroptionset.h \
gtkprinteroptionwidget.h
gtk_c_sources += $(gtk_os_unix_c_sources)
endif
if OS_WIN32
gtk_private_h_sources += gtkfilesystemwin32.h gtkprint-win32.h
gtk_c_sources += \
gtk_os_win32_c_sources = \
gtkfilesystemwin32.c \
gtkprint-win32.c \
gtkprintoperation-win32.c
gtk_all_c_sources += $(gtk_os_win32_c_sources)
if OS_WIN32
gtk_private_h_sources += gtkfilesystemwin32.h gtkprint-win32.h
gtk_c_sources += $(gtk_os_win32_c_sources)
endif
if USE_X11
gtk_private_h_sources += gtkxembed.h gtktrayicon.h
gtk_c_sources += \
gtk_use_x11_c_sources = \
gtkplug-x11.c \
gtksocket-x11.c \
gtkxembed.c \
gtktrayicon-x11.c
gtk_use_win32_c_sources = \
gtkplug-win32.c \
gtksocket-win32.c \
gtkwin32embed.c \
gtkwin32embedwidget.c
gtk_use_stuc_c_sources = \
gtkplug-stub.c \
gtksocket-stub.c
gtk_all_c_sources += $(gtk_use_x11_c_sources) $(gtk_use_win32_c_sources) $(gtk_use_stuc_c_sources)
if USE_X11
gtk_private_h_sources += gtkxembed.h gtktrayicon.h xembed.h
gtk_c_sources += $(gtk_use_x11_c_sources)
else
if USE_WIN32
gtk_private_h_sources += gtkwin32embed.h gtkwin32embedwidget.h
gtk_c_sources += gtkplug-win32.c gtksocket-win32.c gtkwin32embed.c gtkwin32embedwidget.c
gtk_c_sources += $(gtk_use_win32_c_sources)
else
gtk_c_sources += gtkplug-stub.c gtksocket-stub.c
gtk_c_sources += $(gtk_use_stub_c_sources)
endif
endif
@ -653,7 +670,7 @@ gtk_built_public_sources = \
gtkmarshal.h \
gtktypebuiltins.h
# built sources that don't get installed
# built headers that don't get installed
gtk_built_private_headers = \
gtkalias.h \
gtkmarshalers.h \
@ -663,7 +680,6 @@ gtk_built_sources = \
gtkaliasdef.c \
gtktypebuiltins.c \
gtkmarshalers.c \
gtkmarshalers.h \
gtkmarshal.c \
${gtk_built_private_headers} \
${gtk_built_public_sources}
@ -717,7 +733,9 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
&& rm -f xgen-gmlh \
&& echo timestamp > $(@F)
gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
(echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
(echo "#include \"gtkmarshalers.h\""; \
echo "#include \"gtkalias.h\""; \
$(GLIB_GENMARSHAL) --prefix=_gtk_marshal $(srcdir)/gtkmarshalers.list --body) >> xgen-gmlc \
&& cp xgen-gmlc gtkmarshalers.c \
&& rm -f xgen-gmlc
@ -731,7 +749,11 @@ stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
&& rm -f xgen-gmh \
&& echo timestamp > $(@F)
gtkmarshal.c: @REBUILD@ gtkmarshal.list
(echo "#include \"gtkalias.h\""; $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body) >> xgen-gmc \
(echo "#include \"gtkmarshal.h\""; \
echo "#include \"gtkalias.h\""; \
$(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body; \
echo "#define __gtk_marshal_MARSHAL_C__"; \
echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \
&& cp xgen-gmc gtkmarshal.c \
&& rm -f xgen-gmc

2
gtk/abicheck.sh
View file

@ -2,4 +2,4 @@
cpp -DINCLUDE_VARIABLES -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
nm -D -g --defined-only .libs/libgtk-x11-2.0.so | cut -d ' ' -f 3 | sort > actual-abi
diff -u expected-abi actual-abi && rm expected-abi actual-abi
diff -u expected-abi actual-abi && rm -f expected-abi actual-abi

12
gtk/aliasfilescheck.sh Executable file
View file

@ -0,0 +1,12 @@
#! /bin/sh
if test "x$gtk_all_c_sources" = x; then
echo gtk_all_c_sources variable not defined
exit 1
fi
grep 'IN_FILE' gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
grep '^ *# *define __' $gtk_all_c_sources | sed 's/.*define //;s/ *$//' | sort > actual-files
diff expected-files actual-files && rm -f expected-files actual-files

39
gtk/gtk.symbols
View file

@ -596,8 +596,8 @@ gtk_check_button_new_with_mnemonic
#endif
#endif
#if IN_HEADER(__GTK_MENU_CHECK_ITEM_H__)
#if IN_FILE(__GTK_MENU_CHECK_ITEM_C__)
#if IN_HEADER(__GTK_CHECK_MENU_ITEM_H__)
#if IN_FILE(__GTK_CHECK_MENU_ITEM_C__)
gtk_check_menu_item_get_active
gtk_check_menu_item_get_draw_as_radio
gtk_check_menu_item_get_inconsistent
@ -884,8 +884,8 @@ gtk_container_unset_focus_chain
#endif
#endif
#if IN_HEADER(__C_TREE_H__)
#if IN_FILE(__G_TREE_C__)
#if IN_HEADER(__GTK_CTREE_H__)
#if IN_FILE(__GTK_CTREE_C__)
#ifndef GTK_DISABLE_DEPRECATED
gtk_ctree_collapse
gtk_ctree_collapse_recursive
@ -1477,7 +1477,6 @@ gtk_file_system_unix_new
#ifdef G_OS_WIN32
gtk_file_system_win32_get_type G_GNUC_CONST
gtk_file_system_win32_new
_gtk_file_system_win32_path_compare
#endif
#endif
#endif
@ -1537,8 +1536,8 @@ gtk_font_button_set_use_size
#endif
#endif
#if IN_HEADER(__GTK_FONSEL_H__)
#if IN_FILE(__GTK_FONSEL_C__)
#if IN_HEADER(__GTK_FONTSEL_H__)
#if IN_FILE(__GTK_FONTSEL_C__)
gtk_font_selection_dialog_get_font_name
gtk_font_selection_dialog_get_preview_text
gtk_font_selection_dialog_get_type G_GNUC_CONST
@ -1939,7 +1938,7 @@ gtk_item_toggle
#endif
#endif
#if IN_HEADER(__GTK_ITEM__FACTORY_H__)
#if IN_HEADER(__GTK_ITEM_FACTORY_H__)
#if IN_FILE(__GTK_ITEM_FACTORY_C__)
#ifndef GTK_DISABLE_DEPRECATED
gtk_item_factories_path_delete
@ -2189,6 +2188,7 @@ gtk_input_dialog_new
#if IN_HEADER(__gtk_marshal_MARSHAL_H__)
#if IN_FILE(__gtk_marshal_MARSHAL_C__)
#ifndef GTK_DISABLE_DEPRECATED
gtk_marshal_BOOLEAN__POINTER
gtk_marshal_BOOLEAN__POINTER_INT_INT
gtk_marshal_BOOLEAN__POINTER_INT_INT_UINT
@ -2217,6 +2217,7 @@ gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM
gtk_marshal_VOID__UINT_STRING
#endif
#endif
#endif
#if IN_HEADER(__GTK_MENU_BAR_H__)
#if IN_FILE(__GTK_MENU_BAR_C__)
@ -4371,19 +4372,21 @@ gtk_vbox_new
#endif
#endif
#if IN_HEADER(__GTK_VBUTTONBOX_H__)
#if IN_FILE(__GTK_VBUTTONBOX_C__)
#if IN_HEADER(__GTK_VBBOX_H__)
#if IN_FILE(__GTK_VBBOX_C__)
#ifndef GTK_DISABLE_DEPRECATED
gtk_vbutton_box_get_layout_default
gtk_vbutton_box_get_spacing_default
gtk_vbutton_box_get_type G_GNUC_CONST
gtk_vbutton_box_new
gtk_vbutton_box_set_layout_default
gtk_vbutton_box_set_spacing_default
#endif
gtk_vbutton_box_get_type G_GNUC_CONST
gtk_vbutton_box_new
#endif
#endif
#if IN_HEADER(__GTK_VIEPORT_H__)
#if IN_FILE(__GTK_VIEPORT_C__)
#if IN_HEADER(__GTK_VIEWPORT_H__)
#if IN_FILE(__GTK_VIEWPORT_C__)
gtk_viewport_get_hadjustment
gtk_viewport_get_shadow_type
gtk_viewport_get_type G_GNUC_CONST
@ -4687,6 +4690,14 @@ gtk_window_unstick
#endif
#endif
#if IN_HEADER(__GTK_WIN32_EMBED_WIDGET_H__)
#if IN_FILE(__GTK_WIN32_EMBED_WIDGET_C__)
#ifdef G_OS_WIN32
gtk_win32_embed_widget_get_type G_GNUC_CONST
#endif
#endif
#endif
#ifdef INCLUDE_VARIABLES
gtk_binary_age
gtk_interface_age

1
gtk/gtkcalendar.c
View file

@ -49,7 +49,6 @@
#undef GTK_DISABLE_DEPRECATED
#include "gtkcalendar.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkdnd.h"
#include "gtkintl.h"

3
gtk/gtkclipboard-quartz.c
View file

@ -30,10 +30,9 @@
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkintl.h"
#include "gtkalias.h"
#include "gtktextbuffer.h"
#include "gtkquartz.h"
#include "gtkalias.h"
enum {
OWNER_CHANGE,

3
gtk/gtkdnd-quartz.c
View file

@ -43,9 +43,8 @@
#include "gtkstock.h"
#include "gtkwindow.h"
#include "gtkintl.h"
#include "gtkalias.h"
#include "gtkquartz.h"
#include "gtkalias.h"
#include "gdk/quartz/gdkquartz.h"
typedef struct _GtkDragSourceSite GtkDragSourceSite;

3
gtk/gtkdnd.c
View file

@ -43,6 +43,7 @@
#include "gtkstock.h"
#include "gtkwindow.h"
#include "gtkintl.h"
#include "gtkdndcursors.h"
#include "gtkalias.h"
static GSList *source_widgets = NULL;
@ -300,8 +301,6 @@ static void set_icon_stock_pixbuf (GdkDragContext *context,
* Cursor and Icon data *
************************/
#include "gtkdndcursors.h"
static struct {
GdkDragAction action;
const gchar *name;

2
gtk/gtkexpander.c
View file

@ -32,8 +32,8 @@
#include "gtkintl.h"
#include "gtkprivate.h"
#include <gdk/gdkkeysyms.h>
#include "gtkalias.h"
#include "gtkdnd.h"
#include "gtkalias.h"
#define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate))

3
gtk/gtkfilechooserdefault.c
View file

@ -8670,6 +8670,3 @@ shortcuts_model_filter_new (GtkFileChooserDefault *impl,
return GTK_TREE_MODEL (model);
}
#define __GTK_FILE_CHOOSER_DEFAULT_C__
#include "gtkaliasdef.c"

3
gtk/gtkfilechooserembed.c
View file

@ -219,6 +219,3 @@ _gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
}
#define __GTK_FILE_CHOOSER_EMBED_C__
#include "gtkaliasdef.c"

3
gtk/gtkfilechooserentry.c
View file

@ -1075,6 +1075,3 @@ _gtk_file_chooser_entry_get_is_folder (GtkFileChooserEntry *chooser_entry,
return retval;
}
#define __GTK_FILE_CHOOSER_ENTRY_C__
#include "gtkaliasdef.c"

1
gtk/gtkfilechoosersettings.c
View file

@ -34,6 +34,7 @@
#include <string.h>
#include <glib/gi18n-lib.h>
#include "gtkfilechoosersettings.h"
#include "gtkalias.h"
/* Increment this every time you change the configuration format */
#define CONFIG_VERSION 0

3
gtk/gtkfilechooserutils.c
View file

@ -360,6 +360,3 @@ delegate_confirm_overwrite (GtkFileChooser *chooser,
g_signal_emit_by_name (data, "confirm-overwrite", &conf);
return conf;
}
#define __GTK_FILE_CHOOSER_UTILS_C__
#include "gtkaliasdef.c"

1
gtk/gtkfilesel.c
View file

@ -78,7 +78,6 @@
#undef GTK_DISABLE_DEPRECATED
#include "gtkoptionmenu.h"
#define GTK_DISABLE_DEPRECATED
#define WANT_HPANED 1
#include "gtkhpaned.h"

2
gtk/gtkfilesystem.c
View file

@ -24,8 +24,8 @@
#include "gtkicontheme.h"
#include "gtkmodules.h"
#include "gtkintl.h"
#include "gtkalias.h"
#include "gtkstock.h"
#include "gtkalias.h"
#include <string.h>

3
gtk/gtkfilesystemmodel.c
View file

@ -2021,6 +2021,3 @@ root_files_removed_callback (GtkFileFolder *folder,
{
do_files_removed (model, NULL, paths);
}
#define __GTK_FILE_SYSTEM_MODEL_C__
#include "gtkaliasdef.c"

2
gtk/gtkiconcache.c
View file

@ -21,6 +21,8 @@
#include "gtkdebug.h"
#include "gtkiconcache.h"
#include "gtkalias.h"
#include <glib/gstdio.h>
#include <gdk-pixbuf/gdk-pixdata.h>

1
gtk/gtkinputdialog.c
View file

@ -52,7 +52,6 @@
#undef GTK_DISABLE_DEPRECATED
#include "gtkoptionmenu.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkintl.h"
#include "gtkalias.h"

1
gtk/gtkitemfactory.c
View file

@ -32,7 +32,6 @@
#undef GTK_DISABLE_DEPRECATED
#include "gtkitemfactory.h"
#include "gtkoptionmenu.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkmenubar.h"
#include "gtkmenu.h"
#include "gtkmenuitem.h"

1
gtk/gtkmnemonichash.c
View file

@ -20,6 +20,7 @@
*/
#include "gtkmnemonichash.h"
#include "gtkalias.h"
struct _GtkMnemnonicHash
{

1
gtk/gtkmodules.c
View file

@ -27,6 +27,7 @@
#include "gtkdebug.h"
#include "gtkprivate.h" /* GTK_LIBDIR */
#include "gtkintl.h"
#include "gtkalias.h"
#include <gmodule.h>
#include <pango/pango-utils.h> /* For pango_split_file_list */

2
gtk/gtknotebook.c
View file

@ -37,8 +37,8 @@
#include "gtkmarshalers.h"
#include "gtkbindings.h"
#include "gtkprivate.h"
#include "gtkalias.h"
#include "gtkdnd.h"
#include "gtkalias.h"
#define SCROLL_DELAY_FACTOR 5
#define SCROLL_THRESHOLD 12

1
gtk/gtkoptionmenu.c
View file

@ -33,7 +33,6 @@
#undef GTK_DISABLE_DEPRECATED
#include "gtkoptionmenu.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkprivate.h"
#include "gtkalias.h"

3
gtk/gtkpathbar.c
View file

@ -1658,3 +1658,6 @@ _gtk_path_bar_down (GtkPathBar *path_bar)
}
}
}
#define __GTK_PATH_BAR_C__
#include "gtkaliasdef.c"

6
gtk/gtkpathbar.h
View file

@ -17,8 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __GTK_PATH_BAR__
#define __GTK_PATH_BAR__
#ifndef __GTK_PATH_BAR_H__
#define __GTK_PATH_BAR_H__
#include "gtkcontainer.h"
#include "gtkfilesystem.h"
@ -91,4 +91,4 @@ void _gtk_path_bar_down (GtkPathBar *path_bar);
G_END_DECLS
#endif /* __GTK_PATH_BAR__ */
#endif /* __GTK_PATH_BAR_H__ */

1
gtk/gtkplug-stub.c
View file

@ -27,6 +27,7 @@
#include "gtkplug.h"
#include "gtkplugprivate.h"
#include "gtkalias.h"
GdkNativeWindow
_gtk_plug_windowing_get_id (GtkPlug *plug)

1
gtk/gtkplug-win32.c
View file

@ -33,6 +33,7 @@
#include "win32/gdkwin32.h"
#include "gtkwin32embed.h"
#include "gtkalias.h"
#if defined(_MSC_VER) && (WINVER < 0x0500)
#ifndef GA_PARENT

2
gtk/gtkplug-x11.c
View file

@ -25,7 +25,6 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gtkalias.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkplug.h"
@ -35,6 +34,7 @@
#include "x11/gdkx.h"
#include "gtkxembed.h"
#include "gtkalias.h"
static void xembed_set_info (GdkWindow *window,
unsigned long flags);

2
gtk/gtkprintoperation-unix.c
View file

@ -44,8 +44,8 @@
#include "gtkprinter-private.h"
#include "gtkprintjob.h"
#include "gtklabel.h"
#include "gtkalias.h"
#include "gtkintl.h"
#include "gtkalias.h"
typedef struct
{

5
gtk/gtkprintoperation-win32.c
View file

@ -40,9 +40,9 @@
#include "gtkinvisible.h"
#include "gtkplug.h"
#include "gtkstock.h"
#include "gtkalias.h"
#include "gtk.h"
#include "gtkwin32embedwidget.h"
#include "gtkalias.h"
#define MAX_PAGE_RANGES 20
#define STATUS_POLLING_TIME 2000
@ -1909,3 +1909,6 @@ gtk_print_run_page_setup_dialog_async (GtkWindow *parent,
done_cb (new_page_setup, data);
g_object_unref (new_page_setup);
}
#define __GTK_PRINT_OPERATION_WIN32_C__
#include "gtkaliasdef.c"

1
gtk/gtkprintutils.c
View file

@ -20,6 +20,7 @@
#include "config.h"
#include "gtkprintutils.h"
#include "gtkalias.h"
gdouble
_gtk_print_convert_to_mm (gdouble len,

1
gtk/gtkprogress.c
View file

@ -29,7 +29,6 @@
#include <string.h>
#undef GTK_DISABLE_DEPRECATED
#include "gtkprogress.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkprivate.h"
#include "gtkintl.h"
#include "gtkalias.h"

1
gtk/gtkquartz.c
View file

@ -21,6 +21,7 @@
#include <config.h>
#include "gtkquartz.h"
#include "gtkalias.h"
NSImage *
_gtk_quartz_create_image_from_pixbuf (GdkPixbuf *pixbuf)

3
gtk/gtkrecentchooserdefault.c
View file

@ -2069,6 +2069,3 @@ _gtk_recent_chooser_default_new (GtkRecentManager *manager)
"recent-manager", manager,
NULL);
}
#define __GTK_RECENT_CHOOSER_DEFAULT_C__
#include "gtkaliasdef.c"

1
gtk/gtkrecentchooserutils.c
View file

@ -27,6 +27,7 @@
#include "config.h"
#include "gtkrecentchooserutils.h"
#include "gtkalias.h"
/* Methods */
static void delegate_set_sort_func (GtkRecentChooser *chooser,

1
gtk/gtksequence.c
View file

@ -20,6 +20,7 @@
#include <glib.h>
#include "gtksequence.h"
#include "gtkalias.h"
typedef struct _GtkSequenceNode GtkSequenceNode;

1
gtk/gtksocket-stub.c
View file

@ -27,6 +27,7 @@
#include "gtksocket.h"
#include "gtksocketprivate.h"
#include "gtkalias.h"
GdkNativeWindow
_gtk_socket_windowing_get_id (GtkSocket *socket)

1
gtk/gtksocket-win32.c
View file

@ -38,6 +38,7 @@
#include "win32/gdkwin32.h"
#include "gtkwin32embed.h"
#include "gtkalias.h"
GdkNativeWindow
_gtk_socket_windowing_get_id (GtkSocket *socket)

4
gtk/gtkstatusicon.c
View file

@ -39,8 +39,6 @@
#include "gtkprivate.h"
#include "gtkwidget.h"
#include "gtkalias.h"
#ifdef GDK_WINDOWING_WIN32
#include "gtkicontheme.h"
#include "gtklabel.h"
@ -49,6 +47,8 @@
#define WM_GTK_TRAY_NOTIFICATION (WM_USER+1)
#endif
#include "gtkalias.h"
#define BLINK_TIMEOUT 500
enum

1
gtk/gtkstyle.c
View file

@ -32,7 +32,6 @@
#include "gtkmarshalers.h"
#undef GTK_DISABLE_DEPRECATED
#include "gtkoptionmenu.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkrc.h"
#include "gtkspinbutton.h"
#include "gtkstyle.h"

2
gtk/gtktextbufferrichtext.c
View file

@ -25,8 +25,8 @@
#include "gtktextbufferrichtext.h"
#include "gtktextbufferserialize.h"
#include "gtkalias.h"
#include "gtkintl.h"
#include "gtkalias.h"
typedef struct

2
gtk/gtktextbufferserialize.c
View file

@ -31,8 +31,8 @@
#include "gdk-pixbuf/gdk-pixdata.h"
#include "gtktextbufferserialize.h"
#include "gtkintl.h"
#include "gtkalias.h"
typedef struct

2
gtk/gtktoolitem.c
View file

@ -27,8 +27,8 @@
#include "gtkseparatormenuitem.h"
#include "gtkintl.h"
#include "gtkmain.h"
#include "gtkalias.h"
#include "gtkprivate.h"
#include "gtkalias.h"
#include <string.h>

2
gtk/gtktreemodelfilter.c
View file

@ -22,8 +22,8 @@
#include "gtktreemodelfilter.h"
#include "gtkintl.h"
#include "gtktreednd.h"
#include "gtkalias.h"
#include "gtkprivate.h"
#include "gtkalias.h"
#include <string.h>
/* ITER FORMAT:

6
gtk/gtkvbbox.h
View file

@ -24,8 +24,8 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef __GTK_VBUTTON_BOX_H__
#define __GTK_VBUTTON_BOX_H__
#ifndef __GTK_VBBOX_H__
#define __GTK_VBBOX_H__
#include <gtk/gtkbbox.h>
@ -73,4 +73,4 @@ void gtk_vbutton_box_set_layout_default (GtkButtonBoxStyle layout);
G_END_DECLS
#endif /* __GTK_VBUTTON_BOX_H__ */
#endif /* __GTK_VBBOX_H__ */

5
gtk/gtkwin32embed.c
View file

@ -26,6 +26,8 @@
#include "gtkwin32embed.h"
#include "gtkalias.h"
static guint message_type[GTK_WIN32_EMBED_LAST];
static GSList *current_messages;
@ -130,6 +132,3 @@ _gtk_win32_embed_get_focus_wrapped (void)
return (msg->lParam & GTK_WIN32_EMBED_FOCUS_WRAPAROUND) != 0;
}

9
gtk/makegtkalias.pl
View file

@ -16,11 +16,6 @@ print <<EOF;
#ifdef G_HAVE_GNUC_VISIBILITY
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_DISABLE_DEPRECATED
#define REENABLE_DEPRECATED
#endif
EOF
if ($do_def) {
@ -134,10 +129,6 @@ EOF
}
print <<EOF;
#ifdef REENABLE_DEPRECATED
#undef GTK_DISABLE_DEPRECATED
#endif
#endif /* G_HAVE_GNUC_VISIBILITY */
#endif /* DISABLE_VISIBILITY */
EOF

17
gtk/pltcheck.sh Executable file
View file

@ -0,0 +1,17 @@
#!/bin/sh
LANG=C
status=0
if ! which readelf 2>/dev/null >/dev/null; then
echo "'readelf' not found; skipping test"
exit 0
fi
for so in .libs/lib*.so; do
echo Checking $so for local PLT entries
readelf -r $so | grep 'JU\?MP_SLOT' | grep '\<gtk' && status=1
done
exit $status