Hello community,
here is the log from the commit of package gnome-web-photo for openSUSE:Factory
checked in at Wed Jul 27 18:15:05 CEST 2011.
--------
--- GNOME/gnome-web-photo/gnome-web-photo.changes 2011-07-05 08:58:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-web-photo/gnome-web-photo.changes 2011-07-25 22:43:56.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Jul 25 22:43:22 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 0.10.3:
+ + Add --delay option, to specify wait time between rendering and
+ capturing
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-web-photo-0.10.2.tar.bz2
New:
----
gnome-web-photo-0.10.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-web-photo.spec ++++++
--- /var/tmp/diff_new_pack.Kajd32/_old 2011-07-27 18:09:02.000000000 +0200
+++ /var/tmp/diff_new_pack.Kajd32/_new 2011-07-27 18:09:02.000000000 +0200
@@ -18,7 +18,7 @@
Name: gnome-web-photo
-Version: 0.10.2
+Version: 0.10.3
Release: 1
License: GPLv2+
Summary: GNOME Web Photographer
++++++ gnome-web-photo-0.10.2.tar.bz2 -> gnome-web-photo-0.10.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-web-photo-0.10.2/ChangeLog new/gnome-web-photo-0.10.3/ChangeLog
--- old/gnome-web-photo-0.10.2/ChangeLog 2011-07-04 17:02:14.000000000 +0200
+++ new/gnome-web-photo-0.10.3/ChangeLog 2011-07-25 21:34:51.000000000 +0200
@@ -1,3 +1,35 @@
+commit a1fe145d86b9aecb5eee0eae813cc51ed723c0e0
+Author: Vincent Untz
+Date: Mon Jul 25 09:18:02 2011 +0200
+
+ Add --delay option, to specify wait time between rendering and capturing
+
+ Default is 0.
+ Also clarify --timeout help text.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=647434
+
+ src/gnome-web-photo.c | 60 +++++++++++++++++++++++++++++++++++++++---------
+ 1 files changed, 48 insertions(+), 12 deletions(-)
+
+commit 19e81f7f0a9c7d6d066bf942d1c35e010c37cdd5
+Author: Vincent Untz
+Date: Mon Jul 4 17:02:39 2011 +0200
+
+ release: post-release bump to 0.10.3
+
+ configure.ac | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit 04323261c602a641db033989ddf9ffafa7e8b933
+Author: Vincent Untz
+Date: Mon Jul 4 17:02:29 2011 +0200
+
+ release: 0.10.2
+
+ NEWS | 15 +++++++++++++++
+ 1 files changed, 15 insertions(+), 0 deletions(-)
+
commit 9b3eb2d82461fd0368bcf26e63f7fb077f34cc3d
Author: Vincent Untz
Date: Mon Jul 4 17:00:08 2011 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-web-photo-0.10.2/NEWS new/gnome-web-photo-0.10.3/NEWS
--- old/gnome-web-photo-0.10.2/NEWS 2011-07-04 16:58:02.000000000 +0200
+++ new/gnome-web-photo-0.10.3/NEWS 2011-07-25 21:34:31.000000000 +0200
@@ -1,4 +1,13 @@
==============
+Version 0.10.3
+==============
+
+ Features
+
+ * Add --delay option, to specify wait time between rendering and
+ capturing
+
+==============
Version 0.10.2
==============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-web-photo-0.10.2/configure new/gnome-web-photo-0.10.3/configure
--- old/gnome-web-photo-0.10.2/configure 2011-07-04 17:02:07.000000000 +0200
+++ new/gnome-web-photo-0.10.3/configure 2011-07-25 21:34:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for GNOME Web Photo 0.10.2.
+# Generated by GNU Autoconf 2.65 for GNOME Web Photo 0.10.3.
#
# Report bugs to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-web-photo.
#
@@ -553,8 +553,8 @@
# Identity of this package.
PACKAGE_NAME='GNOME Web Photo'
PACKAGE_TARNAME='gnome-web-photo'
-PACKAGE_VERSION='0.10.2'
-PACKAGE_STRING='GNOME Web Photo 0.10.2'
+PACKAGE_VERSION='0.10.3'
+PACKAGE_STRING='GNOME Web Photo 0.10.3'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-web-photo'
PACKAGE_URL=''
@@ -1316,7 +1316,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNOME Web Photo 0.10.2 to adapt to many kinds of systems.
+\`configure' configures GNOME Web Photo 0.10.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1382,7 +1382,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNOME Web Photo 0.10.2:";;
+ short | recursive ) echo "Configuration of GNOME Web Photo 0.10.3:";;
esac
cat <<\_ACEOF
@@ -1501,7 +1501,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNOME Web Photo configure 0.10.2
+GNOME Web Photo configure 0.10.3
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1872,7 +1872,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNOME Web Photo $as_me 0.10.2, which was
+It was created by GNOME Web Photo $as_me 0.10.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -2688,7 +2688,7 @@
# Define the identity of the package.
PACKAGE='gnome-web-photo'
- VERSION='0.10.2'
+ VERSION='0.10.3'
cat >>confdefs.h <<_ACEOF
@@ -7331,7 +7331,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNOME Web Photo $as_me 0.10.2, which was
+This file was extended by GNOME Web Photo $as_me 0.10.3, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7397,7 +7397,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNOME Web Photo config.status 0.10.2
+GNOME Web Photo config.status 0.10.3
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-web-photo-0.10.2/configure.ac new/gnome-web-photo-0.10.3/configure.ac
--- old/gnome-web-photo-0.10.2/configure.ac 2011-07-04 17:01:26.000000000 +0200
+++ new/gnome-web-photo-0.10.3/configure.ac 2011-07-04 17:02:38.000000000 +0200
@@ -16,7 +16,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-AC_INIT([GNOME Web Photo],[0.10.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-web-photo],[gnome-web-photo])
+AC_INIT([GNOME Web Photo],[0.10.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-web-photo],[gnome-web-photo])
AC_PREREQ([2.59])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-web-photo-0.10.2/src/gnome-web-photo.c new/gnome-web-photo-0.10.3/src/gnome-web-photo.c
--- old/gnome-web-photo-0.10.2/src/gnome-web-photo.c 2011-02-16 20:10:41.000000000 +0100
+++ new/gnome-web-photo-0.10.3/src/gnome-web-photo.c 2011-07-25 09:16:19.000000000 +0200
@@ -102,6 +102,7 @@
gboolean print_background;
char *printer;
+ int delay;
int timeout;
gboolean force;
@@ -110,6 +111,7 @@
GtkWidget *window;
WebKitWebView *webview;
guint idle_id;
+ guint delay_id;
guint timeout_id;
} PhotoData;
@@ -588,6 +590,17 @@
}
static gboolean
+_on_delay (PhotoData *data)
+{
+ data->delay_id = 0;
+
+ _do_action (data);
+ gtk_main_quit ();
+
+ return FALSE;
+}
+
+static gboolean
_on_web_view_load_error (WebKitWebView *webview,
WebKitWebFrame *frame,
const char *uri,
@@ -617,9 +630,11 @@
data->timeout_id = 0;
}
- _do_action (data);
-
- gtk_main_quit ();
+ if (data->delay > 0)
+ data->delay_id = g_timeout_add_seconds (data->delay,
+ (GSourceFunc) _on_delay, data);
+ else
+ _on_delay (data);
return FALSE;
}
@@ -649,6 +664,8 @@
static gboolean
_on_timeout (PhotoData *data)
{
+ gboolean quit = TRUE;
+
data->timeout_id = 0;
if (data->idle_id > 0) {
g_source_remove (data->idle_id);
@@ -661,7 +678,14 @@
case WEBKIT_LOAD_FINISHED:
/* Translators: first %s is a URI */
g_printerr (_("Timed out while loading '%s'. Outputting current view...\n"), data->uri);
- _do_action (data);
+
+ if (data->delay > 0) {
+ quit = FALSE;
+ data->delay_id = g_timeout_add_seconds (data->delay,
+ (GSourceFunc) _on_delay, data);
+ } else
+ _do_action (data);
+
break;
default:
@@ -679,7 +703,8 @@
/* We have to do it after checking the load status */
webkit_web_view_stop_loading (data->webview);
- gtk_main_quit ();
+ if (quit)
+ gtk_main_quit ();
return FALSE;
}
@@ -794,16 +819,16 @@
switch (parsed_mode) {
case MODE_PHOTO:
- g_print (_("Usage: %s [-c CSSFILE] [-t TIMEOUT] [--force] [-w WIDTH] [--file] URI|FILE OUTFILE\n"), name);
+ g_print (_("Usage: %s [-c CSSFILE] [-d DELAY] [-t TIMEOUT] [--force] [-w WIDTH] [--file] URI|FILE OUTFILE\n"), name);
break;
case MODE_THUMBNAIL:
- g_print (_("Usage: %s [-c CSSFILE] [-t TIMEOUT] [--force] [-w WIDTH] [-s THUMBNAILSIZE] [--file] URI|FILE OUTFILE\n"), name);
+ g_print (_("Usage: %s [-c CSSFILE] [-d DELAY] [-t TIMEOUT] [--force] [-w WIDTH] [-s THUMBNAILSIZE] [--file] URI|FILE OUTFILE\n"), name);
break;
case MODE_PRINT:
#ifdef HAVE_GTK_UNIX_PRINT
- g_print (_("Usage: %s [-c CSSFILE] [-t TIMEOUT] [--force] [-w WIDTH] [--print-background] [--file] URI|FILE OUTFILE|--printer=PRINTER\n"), name);
+ g_print (_("Usage: %s [-c CSSFILE] [-d DELAY] [-t TIMEOUT] [--force] [-w WIDTH] [--print-background] [--file] URI|FILE OUTFILE|--printer=PRINTER\n"), name);
#else
- g_print (_("Usage: %s [-c CSSFILE] [-t TIMEOUT] [--force] [-w WIDTH] [--print-background] [--file] URI|FILE OUTFILE\n"), name);
+ g_print (_("Usage: %s [-c CSSFILE] [-d DELAY] [-t TIMEOUT] [--force] [-w WIDTH] [--print-background] [--file] URI|FILE OUTFILE\n"), name);
#endif
break;
default:
@@ -871,9 +896,9 @@
/* thumbnail_size set to -1 to be able to check if option
* was passed or not */
NULL, DEFAULT_WIDTH, -1, FALSE, NULL,
- 60, FALSE,
+ 0, 60, FALSE,
FALSE,
- NULL, NULL, 0, 0 };
+ NULL, NULL, 0, 0, 0 };
const GOptionEntry main_options[] =
{
@@ -883,8 +908,12 @@
N_("User style sheet to use for the page (default: " PKGDATADIR "/style.css)"),
/* Translators: CSSFILE will appear in the help, as in: --user-css=CSSFILE */
N_("CSSFILE") },
+ { "delay", 'd', 0, G_OPTION_ARG_INT, &data.delay,
+ N_("Delay in seconds to wait after page is loaded, or 0 to disable delay (default: 0)"),
+ /* Translators: T will appear in the help, as in: --delay=D */
+ N_("D") },
{ "timeout", 't', 0, G_OPTION_ARG_INT, &data.timeout,
- N_("Timeout in seconds, or 0 to disable timeout (default: 60)"),
+ N_("Timeout in seconds to wait to load the page, or 0 to disable timeout (default: 60)"),
/* Translators: T will appear in the help, as in: --timeout=T */
N_("T") },
{ "force", 'f', 0, G_OPTION_ARG_NONE, &data.force,
@@ -990,6 +1019,13 @@
g_object_unref (file);
}
+ /* Check delay */
+ if (data.delay < 0) {
+ g_printerr (_("--delay cannot be negative!\n"));
+ _print_synopsis ();
+ return 1;
+ }
+
/* Check timeout */
if (data.timeout < 0) {
g_printerr (_("--timeout cannot be negative!\n"));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org