office/evince
office/evince
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/evince synced 2024-06-30 22:54:23 +00:00
Code Issues Projects Releases Wiki Activity

Share it between all cut-n-paste subdirs

Browse Source 
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
This commit is contained in:
Marco Pesenti Gritti 2005-05-09 12:21:28 +00:00 committed by Marco Pesenti Gritti
parent b36f3a1316
commit cd2d70e467
5 changed files with 75 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -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:

4
cut-n-paste/recent-files/Makefile.am
View File

@ -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

6
cut-n-paste/recent-files/egg-recent-model.c
View File

@ -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);

1
cut-n-paste/toolbar-editor/eggmarshalers.list
View File

@ -15,5 +15,6 @@ VOID:OBJECT,ENUM,BOXED
VOID:BOXED
BOOLEAN:BOOLEAN
BOOLEAN:OBJECT,STRING,STRING
BOOLEAN:ENUM,INT
STRING:POINTER
STRING:STRING,STRING

40
cut-n-paste/update-from-egg.sh Executable file
View File

@ -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