Share it between all cut-n-paste subdirs

2005-05-09  Marco Pesenti Gritti  <mpg@redhat.com>

        * cut-n-paste/update-from-egg.sh:

        Share it between all cut-n-paste subdirs

        * cut-n-paste/recent-files/Makefile.am:

        Fix to use "global" update-from-egg.sh

        * cut-n-paste/recent-files/egg-recent-model.c:
        (egg_recent_model_changed_timeout), (egg_recent_model_finalize):
        * cut-n-paste/recent-files/egg-recent-view-gtk.c:
        (egg_recent_view_gtk_clear), (egg_recent_view_gtk_set_list),
        (egg_recent_view_gtk_finalize), (egg_recent_view_gtk_set_menu):

        Update from libegg

        * cut-n-paste/toolbar-editor/Makefile.am:

        Fix to use "global" update-from-egg.sh

        * cut-n-paste/toolbar-editor/eggmarshalers.list:

        Update from libegg

diff --git a/ChangeLog b/ChangeLog
index e2e1e67de6524cf10d1c0ed43a444c8b40ff5446..3915d915ee312532e7f10ee65ec8e71199a62a67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2005-05-09  Marco Pesenti Gritti  <mpg@redhat.com>
+
+       * cut-n-paste/update-from-egg.sh:
+       
+       Share it between all cut-n-paste subdirs
+
+       * cut-n-paste/recent-files/Makefile.am:
+
+       Fix to use "global" update-from-egg.sh
+
+       * cut-n-paste/recent-files/egg-recent-model.c:
+       (egg_recent_model_changed_timeout), (egg_recent_model_finalize):
+       * cut-n-paste/recent-files/egg-recent-view-gtk.c:
+       (egg_recent_view_gtk_clear), (egg_recent_view_gtk_set_list),
+       (egg_recent_view_gtk_finalize), (egg_recent_view_gtk_set_menu):
+
+       Update from libegg
+
+       * cut-n-paste/toolbar-editor/Makefile.am:
+
+       Fix to use "global" update-from-egg.sh
+
+       * cut-n-paste/toolbar-editor/eggmarshalers.list:
+
+       Update from libegg
+
 2005-05-09  Marco Pesenti Gritti <mpg@redhat.com>
 
        * configure.ac:

diff --git a/cut-n-paste/recent-files/Makefile.am b/cut-n-paste/recent-files/Makefile.am
index aa490a4bcbbbfafacb55080cfe266f595916a487..bd05134b97f3a33158c36d308f682ce9cf6df385 100644 (file)
--- a/cut-n-paste/recent-files/Makefile.am
+++ b/cut-n-paste/recent-files/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 
 INCLUDES = \
-       $(EGG_CFLAGS) \
+       $(RECENT_FILES_CFLAGS) \
        $(NULL)
 
 #      Uses the deprecated GnomeIconTheme
@@ -27,4 +27,4 @@ EXTRA_DIST = update-from-egg.sh
 
 EGGDIR=$(srcdir)/../../../libegg/libegg/recent-files
 regenerate-built-sources:
-       EGGFILES="$(EGG_FILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh
+       EGGFILES="$(EGG_FILES)" EGGDIR="$(EGGDIR)" $(top_srcdir)/cut-n-paste/update-from-egg.sh

diff --git a/cut-n-paste/recent-files/egg-recent-model.c b/cut-n-paste/recent-files/egg-recent-model.c
index 201aec006d7d17c54ce01d72276fde697e875174..8b3abe5eaaed964b487e2f34efdced0d89aac7d0 100644 (file)
--- a/cut-n-paste/recent-files/egg-recent-model.c
+++ b/cut-n-paste/recent-files/egg-recent-model.c
@@ -643,6 +643,8 @@ egg_recent_model_monitor_list (EggRecentModel *model, GList *list)
 static gboolean
 egg_recent_model_changed_timeout (EggRecentModel *model)
 {
+       model->priv->changed_timeout = 0;
+
        egg_recent_model_changed (model);
 
        return FALSE;
@@ -929,6 +931,10 @@ egg_recent_model_finalize (GObject *object)
 {
        EggRecentModel *model = EGG_RECENT_MODEL (object);
 
+       if (model->priv->changed_timeout > 0) {
+               g_source_remove (model->priv->changed_timeout);
+       }
+
        egg_recent_model_monitor (model, FALSE);
 
 

diff --git a/cut-n-paste/toolbar-editor/eggmarshalers.list b/cut-n-paste/toolbar-editor/eggmarshalers.list
index 7b79b0f3a5e8a55d93f4a11e846abd2e03071c65..97654cb091e4a567dbd1b0ecce3a967bd9a6277f 100644 (file)
--- a/cut-n-paste/toolbar-editor/eggmarshalers.list
+++ b/cut-n-paste/toolbar-editor/eggmarshalers.list
@@ -15,5 +15,6 @@ VOID:OBJECT,ENUM,BOXED
 VOID:BOXED
 BOOLEAN:BOOLEAN
 BOOLEAN:OBJECT,STRING,STRING
+BOOLEAN:ENUM,INT
 STRING:POINTER
 STRING:STRING,STRING

diff --git a/cut-n-paste/update-from-egg.sh b/cut-n-paste/update-from-egg.sh
new file mode 100755 (executable)
index 0000000..5069044
--- /dev/null
+++ b/cut-n-paste/update-from-egg.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+function die() {
+  echo $*
+  exit 1
+}
+
+if test -z "$EGGDIR"; then
+   echo "Must set EGGDIR"
+   exit 1
+fi
+
+if test -z "$EGGFILES"; then
+   echo "Must set EGGFILES"
+   exit 1
+fi
+
+for FILE in $EGGFILES; do
+  SRCFILE=$EGGDIR/$FILE
+  if ! test -e $SRCFILE ; then
+      if test -e $EGGDIR/tray/$FILE ; then
+          SRCFILE=$EGGDIR/tray/$FILE
+      fi
+      if test -e $EGGDIR/util/$FILE ; then
+          SRCFILE=$EGGDIR/util/$FILE
+      fi
+      if test -e $EGGDIR/toolbareditor/$FILE ; then
+          SRCFILE=$EGGDIR/toolbareditor/$FILE
+      fi
+      if test -e $EGGDIR/treeviewutils/$FILE ; then
+          SRCFILE=$EGGDIR/treeviewutils/$FILE
+      fi
+  fi
+  if cmp -s $SRCFILE $FILE; then
+     echo "File $FILE is unchanged"
+  else
+     cp $SRCFILE $FILE || die "Could not move $SRCFILE to $FILE"
+     echo "Updated $FILE"
+  fi
+done