diff options
| author | Vincent Geddes <vgeddes@src.gnome.org> | 2007-06-29 02:02:06 +0000 |
|---|---|---|
| committer | Vincent Geddes <vgeddes@src.gnome.org> | 2007-06-29 02:02:06 +0000 |
| commit | bdd65a68103744ce7726769dc7073d8606447353 (patch) | |
| tree | 30debf59e7f495930896de0659437d26a53b062c | |
| parent | 752071c66e2cd141cbbbe8a762b8f3f70016b65f (diff) | |
| download | glade-bdd65a68103744ce7726769dc7073d8606447353.tar.gz | |
Moved gladeui/fixed_bg.xpm to plugins/gtk+/fixed-bg.xpm. The graphic is
* gladeui/fixed_bg.xpm, gladeui/Makefile.am,
plugins/gtk+/Makefile.am: Moved gladeui/fixed_bg.xpm to plugins/gtk+/fixed-bg.xpm.
The graphic is only used by the GTK+ plugin.
svn path=/trunk/; revision=1414
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gladeui/Makefile.am | 3 | ||||
| -rw-r--r-- | plugins/gtk+/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/gtk+/fixed-bg.xpm (renamed from gladeui/fixed_bg.xpm) | 0 | ||||
| -rw-r--r-- | plugins/gtk+/glade-gtk.c | 3 |
5 files changed, 8 insertions, 4 deletions
@@ -1,5 +1,9 @@ 2007-06-28 Vincent Geddes <vgeddes@gnome.org> + * gladeui/fixed_bg.xpm, gladeui/Makefile.am, + plugins/gtk+/Makefile.am: Moved gladeui/fixed_bg.xpm to plugins/gtk+/fixed-bg.xpm. + The graphic is only used by the GTK+ plugin. + * gladeui/glade-editor.c: HIGify query dialog. * plugins/gtk+/Makefile.am, plugins/gnome/Makefile.am: Set log domains diff --git a/gladeui/Makefile.am b/gladeui/Makefile.am index 6ba2385b..600d5a59 100644 --- a/gladeui/Makefile.am +++ b/gladeui/Makefile.am @@ -114,8 +114,7 @@ libgladeuiinclude_HEADERS = \ glade-parser.h \ glade-signal.h \ glade-cursor.h \ - glade-widget-action.h \ - fixed_bg.xpm + glade-widget-action.h if PLATFORM_WIN32 diff --git a/plugins/gtk+/Makefile.am b/plugins/gtk+/Makefile.am index cb085d27..023b7ac9 100644 --- a/plugins/gtk+/Makefile.am +++ b/plugins/gtk+/Makefile.am @@ -23,7 +23,7 @@ libgladegtk_la_CFLAGS = \ $(PLUGINS_WARN_CFLAGS) \ $(AM_CFLAGS) -libgladegtk_la_SOURCES = glade-gtk.c +libgladegtk_la_SOURCES = glade-gtk.c fixed-bg.xpm libgladegtk_la_LDFLAGS = -module -avoid-version $(AM_LDFLAGS) libgladegtk_la_LIBADD = $(libgladeui) $(GTK_LIBS) diff --git a/gladeui/fixed_bg.xpm b/plugins/gtk+/fixed-bg.xpm index a2fe89f3..a2fe89f3 100644 --- a/gladeui/fixed_bg.xpm +++ b/plugins/gtk+/fixed-bg.xpm diff --git a/plugins/gtk+/glade-gtk.c b/plugins/gtk+/glade-gtk.c index 7a48e8c5..bf532e8b 100644 --- a/plugins/gtk+/glade-gtk.c +++ b/plugins/gtk+/glade-gtk.c @@ -25,10 +25,11 @@ #include <config.h> #include "glade-gtk.h" +#include "fixed-bg.xpm" #include <gladeui/glade-editor-property.h> #include <gladeui/glade-base-editor.h> -#include <gladeui/fixed_bg.xpm> + #include <gtk/gtk.h> #include <glib/gi18n-lib.h> |