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

diff --git a/ChangeLog b/ChangeLog
index 186c5ae75c065bd93c573abebe95ec4d5ba976af..f0ebaab1059b8802948fc02a2eebee8278ceec04 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+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
+
 Sat May 21 23:18:30 2005  Jonathan Blandford  <jrb@redhat.com>
 
        * tiff/tiff-document.c: Rough TIFF backend.

diff --git a/cut-n-paste/recent-files/egg-recent-item.c b/cut-n-paste/recent-files/egg-recent-item.c
index 535e2227779aacff79e0b6819df530a0859ee90b..bf7fee6c636d153d55d45d64b76bd6ed3c639356 100644 (file)
--- a/cut-n-paste/recent-files/egg-recent-item.c
+++ b/cut-n-paste/recent-files/egg-recent-item.c
@@ -316,6 +316,11 @@ egg_recent_item_get_short_name (const EggRecentItem *item)
                return NULL;
 
        short_name = gnome_vfs_uri_extract_short_name (uri);
+       if (short_name == NULL) {
+               gnome_vfs_uri_unref (uri);
+               return NULL;
+       }
+
        valid = FALSE;
 
        if (strcmp (gnome_vfs_uri_get_scheme (uri), "file") == 0) {

diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am
index a2e5c462d090a9f1c680941af5b0f041f8f56557..95157ff978616b6a5b5d6582706a5539940d708b 100644 (file)
--- 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 02791ee867c5f7595a2ac85d1753e30dc489ab05..a74f4fdfc5fd32de7892697cb8624ec811a019a5 100644 (file)
--- 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 (file)
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 b3419455fcb624af86de893d5ccbf8659eb68739..f3ba1e94df87a81ed871e37f756622fe9351f6b3 100644 (file)
--- 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>