diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-01-04 15:05:07 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-04 15:05:07 +0000 |
| commit | 3b54167d991f134fa8f464e34547c27bcd5d4228 (patch) | |
| tree | 806c57fc9e12fec93d30ff00e37f5dafca90b8a5 | |
| parent | 0bf8e61f8ad15b4d1f376596dc1b62159b2afa06 (diff) | |
| download | gtk+-3b54167d991f134fa8f464e34547c27bcd5d4228.tar.gz | |
Cross-compilation fixes. (#392646, Yevgen Muntyan)
2007-01-04 Matthias Clasen <mclasen@redhat.com>
* gtk/Makefile.am:
* gdk-pixbuf/Makefile.am:
* configure.in:
* gdk/win32/rc/gdk.rc.in: Cross-compilation fixes.
(#392646, Yevgen Muntyan)
svn path=/trunk/; revision=17065
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | gdk/win32/rc/gdk.rc.in | 2 | ||||
| -rw-r--r-- | gtk/Makefile.am | 14 | ||||
| -rw-r--r-- | gtk/gtkiconview.c | 5 |
4 files changed, 20 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 2d798d1998..06bbaf1ddf 100644 --- a/configure.in +++ b/configure.in @@ -1009,7 +1009,8 @@ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) if test $cross_compiling = yes; then AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) - if test x$GDK_PIXBUF_CSOURCE = xno; then + AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no) + if test x$GTK_UPDATE_ICON_CACHE = xno; then REBUILD_PNGS=# fi fi @@ -1019,7 +1020,7 @@ if test ! -f $srcdir/gtk/gtkbuiltincache.h && AC_MSG_ERROR([ *** gtkbuiltincache.h is not in the tree, and cannot be built *** because you don't have libpng, or (when cross-compiling) you -*** don't have a prebuilt gdk-pixbuf-csource on the host system.]) +*** don't have a prebuilt gtk-update-icon-cache on the build system.]) fi AC_SUBST(REBUILD_PNGS) diff --git a/gdk/win32/rc/gdk.rc.in b/gdk/win32/rc/gdk.rc.in index 8f41373792..a1a00fdef7 100644 --- a/gdk/win32/rc/gdk.rc.in +++ b/gdk/win32/rc/gdk.rc.in @@ -1,6 +1,6 @@ #include <winver.h> -GTK_ICON ICON "gtk.ico" +GTK_ICON ICON "@srcdir@/gtk.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION @GTK_MAJOR_VERSION@,@GTK_MINOR_VERSION@,@GTK_MICRO_VERSION@,0 diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 36ad0292cb..7e5c5c3522 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1116,11 +1116,19 @@ stamp-icons: $(STOCK_ICONS) done \ && touch stamp-icons +if CROSS_COMPILING +gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE) +else +gtk_update_icon_cache_program = \ + GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ + ./gtk-update-icon-cache +endif + gtkbuiltincache.h: @REBUILD@ stamp-icons $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) - GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/gdk-pixbuf.loaders \ - ./gtk-update-icon-cache --force --ignore-theme-index \ - --source builtin_icons stock-icons > gtkbuiltincache.h + $(gtk_update_icon_cache_program) --force --ignore-theme-index \ + --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ + mv gtkbuiltincache.h.tmp gtkbuiltincache.h EXTRA_DIST += \ $(STOCK_ICONS) \ diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index f7ecd435f8..242e98ca9a 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -440,6 +440,8 @@ static gboolean gtk_icon_view_maybe_begin_drag (GtkIconView *icon_ GdkEventMotion *event); static void remove_scroll_timeout (GtkIconView *icon_view); +static void clear_dest_info (GtkIconView *icon_view); +static void clear_source_info (GtkIconView *icon_view); static guint icon_view_signals[LAST_SIGNAL] = { 0 }; @@ -970,6 +972,9 @@ gtk_icon_view_destroy (GtkObject *object) icon_view->priv->vadjustment = NULL; } + clear_dest_info (icon_view); + clear_source_info (icon_view); + (* GTK_OBJECT_CLASS (gtk_icon_view_parent_class)->destroy) (object); } |