diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2005-05-09 12:21:28 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@src.gnome.org> | 2005-05-09 12:21:28 (GMT) |
commit | cd2d70e467e418c1a63e703f3e06df3cb2e92b87 (patch) | |
tree | 903309d2edc52dfdbb86d130ccc4e06cb71b0e15 /cut-n-paste/recent-files | |
parent | b36f3a13160e8747019c40f28df89a9a9c3917ea (diff) |
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
Diffstat (limited to 'cut-n-paste/recent-files')
-rw-r--r-- | cut-n-paste/recent-files/Makefile.am | 4 | ||||
-rw-r--r-- | cut-n-paste/recent-files/egg-recent-model.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cut-n-paste/recent-files/Makefile.am b/cut-n-paste/recent-files/Makefile.am index aa490a4..bd05134 100644 --- 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 201aec0..8b3abe5 100644 --- 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); |