From bdd65a68103744ce7726769dc7073d8606447353 Mon Sep 17 00:00:00 2001 From: Vincent Geddes Date: Fri, 29 Jun 2007 02:02:06 +0000 Subject: 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 --- ChangeLog | 4 ++++ gladeui/Makefile.am | 3 +-- gladeui/fixed_bg.xpm | 17 ----------------- plugins/gtk+/Makefile.am | 2 +- plugins/gtk+/fixed-bg.xpm | 17 +++++++++++++++++ plugins/gtk+/glade-gtk.c | 3 ++- 6 files changed, 25 insertions(+), 21 deletions(-) delete mode 100644 gladeui/fixed_bg.xpm create mode 100644 plugins/gtk+/fixed-bg.xpm diff --git a/ChangeLog b/ChangeLog index 5537f60b..770bb2b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-06-28 Vincent Geddes + * 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/gladeui/fixed_bg.xpm b/gladeui/fixed_bg.xpm deleted file mode 100644 index a2fe89f3..00000000 --- a/gladeui/fixed_bg.xpm +++ /dev/null @@ -1,17 +0,0 @@ -/* XPM */ -static char *fixed_bg_xpm[] = { - /* columns rows colors chars-per-pixel */ - "8 8 2 1", - ". c #bbbbbb", - " c #d6d6d6", - /* pixels */ - " ", - " ", - " ", - " ", - " ", - " ", - " ..", - " ..", - " " -}; 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/plugins/gtk+/fixed-bg.xpm b/plugins/gtk+/fixed-bg.xpm new file mode 100644 index 00000000..a2fe89f3 --- /dev/null +++ b/plugins/gtk+/fixed-bg.xpm @@ -0,0 +1,17 @@ +/* XPM */ +static char *fixed_bg_xpm[] = { + /* columns rows colors chars-per-pixel */ + "8 8 2 1", + ". c #bbbbbb", + " c #d6d6d6", + /* pixels */ + " ", + " ", + " ", + " ", + " ", + " ", + " ..", + " ..", + " " +}; 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 #include "glade-gtk.h" +#include "fixed-bg.xpm" #include #include -#include + #include #include -- cgit v1.2.1