diff options
| author | Marco Pesenti Gritti <mpg@redhat.com> | 2005-05-22 10:59:56 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2005-05-22 10:59:56 (GMT) |
| commit | f53170c757581dd74f34d14c6e70e9a9cf614ff1 (patch) | |
| tree | d24710731171293e72a2d833835be1812f660a58 /cut-n-paste/toolbar-editor | |
| parent | 00062a68c0e383ba1b89288f2480a8b8690f5560 (diff) | |
Sync
2005-05-22 Marco Pesenti Gritti <mpg@redhat.com>
* cut-n-paste/recent-files/egg-recent-item.c:
(egg_recent_item_get_short_name):
* cut-n-paste/toolbar-editor/Makefile.am:
* cut-n-paste/toolbar-editor/egg-editable-toolbar.c:
(new_pixbuf_from_widget):
* cut-n-paste/toolbar-editor/egg-editable-toolbar.h:
* cut-n-paste/toolbar-editor/egg-marshal.c:
* cut-n-paste/toolbar-editor/egg-toolbar-editor.c:
* cut-n-paste/toolbar-editor/egg-toolbars-model.c:
Sync
Diffstat (limited to 'cut-n-paste/toolbar-editor')
| -rw-r--r-- | cut-n-paste/toolbar-editor/Makefile.am | 19 | ||||
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-editable-toolbar.c | 2 | ||||
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-marshal.c | 3 | ||||
| -rw-r--r-- | cut-n-paste/toolbar-editor/egg-toolbar-editor.c | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am index a2e5c46..95157ff 100644 --- a/cut-n-paste/toolbar-editor/Makefile.am +++ b/cut-n-paste/toolbar-editor/Makefile.am @@ -4,17 +4,23 @@ INCLUDES = $(TOOLBAR_EDITOR_CFLAGS) \ noinst_LTLIBRARIES = libtoolbareditor.la -libtoolbareditor_la_SOURCES = \ +EGGSOURCES = \ egg-toolbars-model.c \ egg-editable-toolbar.c \ - egg-toolbar-editor.c \ - egg-marshal.c \ - eggmarshalers.c + egg-toolbar-editor.c -noinst_HEADERS = \ +EGGHEADERS = \ + eggintl.h \ egg-toolbars-model.h \ egg-editable-toolbar.h \ - egg-toolbar-editor.h \ + egg-toolbar-editor.h + +libtoolbareditor_la_SOURCES = \ + $(EGGSOURCES) \ + eggmarshalers.c + +noinst_HEADERS = \ + $(EGGHEADERS) \ eggmarshalers.h BUILT_SOURCES = eggmarshalers.h eggmarshalers.c @@ -31,6 +37,7 @@ egg-marshal.c: eggmarshalers.c eggmarshalers.h EXTRA_DIST= \ eggmarshalers.list +EGGFILES=$(EGGSOURCES) $(EGGHEADERS) EGGDIR=$(srcdir)/../../../libegg/libegg regenerate-built-sources: EGGFILES="$(EGGFILES) eggmarshalers.list" EGGDIR="$(EGGDIR)" $(top_srcdir)/cut-n-paste/update-from-egg.sh diff --git a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c index 02791ee..a74f4fd 100644 --- a/cut-n-paste/toolbar-editor/egg-editable-toolbar.c +++ b/cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -1403,7 +1403,7 @@ new_pixbuf_from_widget (GtkWidget *widget) /* Create a pixmap */ visual = gtk_widget_get_visual (window); - pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, gdk_visual_get_best_depth()); + pixmap = gdk_pixmap_new (NULL, icon_width, icon_height, visual->depth); gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), gtk_widget_get_colormap (window)); /* Draw the window */ diff --git a/cut-n-paste/toolbar-editor/egg-marshal.c b/cut-n-paste/toolbar-editor/egg-marshal.c deleted file mode 100644 index 4eae7e8..0000000 --- a/cut-n-paste/toolbar-editor/egg-marshal.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "eggmarshalers.h" -#include "eggmarshalers.c" - diff --git a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c index b341945..f3ba1e9 100644 --- a/cut-n-paste/toolbar-editor/egg-toolbar-editor.c +++ b/cut-n-paste/toolbar-editor/egg-toolbar-editor.c @@ -20,9 +20,9 @@ #include "egg-toolbar-editor.h" #include "egg-editable-toolbar.h" +#include "eggintl.h" #include <string.h> -#include <glib/gi18n.h> #include <libxml/tree.h> #include <gtk/gtkimage.h> #include <gtk/gtkeventbox.h> |