Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/cut-n-paste/recent-files
diff options
context:
space:
mode:
Diffstat (limited to 'cut-n-paste/recent-files')
-rw-r--r--cut-n-paste/recent-files/Makefile.am4
-rw-r--r--cut-n-paste/recent-files/egg-recent-model.c6
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);