Hello community,
here is the log from the commit of package ristretto for openSUSE:Factory
checked in at 2012-08-07 08:16:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ristretto (Old)
and /work/SRC/openSUSE:Factory/.ristretto.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ristretto", Maintainer is "xfce-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ristretto/ristretto.changes 2012-07-31
13:59:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ristretto.new/ristretto.changes 2012-08-07
08:16:05.000000000 +0200
@@ -1,0 +2,9 @@
+Mon Aug 6 12:04:21 UTC 2012 - g...@opensuse.org
+
+- update to version 0.6.3
+ - use thumbnail as appicon
+ - update the first image in the image-list when receiving a
+ ready-signal which is required to show the thumbnail once it's
+ generated
+
+-------------------------------------------------------------------
Old:
----
ristretto-0.6.2.tar.bz2
New:
----
ristretto-0.6.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ristretto.spec ++++++
--- /var/tmp/diff_new_pack.IEyvwg/_old 2012-08-07 08:16:07.000000000 +0200
+++ /var/tmp/diff_new_pack.IEyvwg/_new 2012-08-07 08:16:07.000000000 +0200
@@ -17,7 +17,7 @@
Name: ristretto
-Version: 0.6.2
+Version: 0.6.3
Release: 0
Summary: Fast and Lightweight Image-viewer for the Xfce Desktop
Environment
License: GPL-2.0+
++++++ ristretto-0.6.2.tar.bz2 -> ristretto-0.6.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ristretto-0.6.2/ChangeLog
new/ristretto-0.6.3/ChangeLog
--- old/ristretto-0.6.2/ChangeLog 2012-07-29 22:44:32.000000000 +0200
+++ new/ristretto-0.6.3/ChangeLog 2012-08-05 22:43:30.000000000 +0200
@@ -1,3 +1,64 @@
+commit 5f302be6b58eee5e98dac9e326c5766f2cb7d9c1
+Author: Stephan Arts <step...@xfce.org>
+Date: Sun Aug 5 22:42:36 2012 +0200
+
+ Bump version number and update NEWS
+
+commit 0b662dd382894f34027a0615f58de914ee623b46
+Author: Stephan Arts <step...@xfce.org>
+Date: Sat Aug 4 23:11:59 2012 +0200
+
+ Show filename before apptitle
+
+ By showing the filename before the application title, it is
+ easier to distinguish between different instances of ristretto
+ in a taskbar that shows only a part of the title.
+
+commit 616ad0f8807b5f9abaf5cba9478333f4564aa58a
+Author: Stephan Arts <step...@xfce.org>
+Date: Sat Aug 4 22:58:52 2012 +0200
+
+ Update NEWS
+
+commit e1b3ab7877ab0e25d12d94a021760db43763aef2
+Author: Stephan Arts <step...@xfce.org>
+Date: Sat Aug 4 22:55:57 2012 +0200
+
+ Update the thumbnail of the first image too.
+
+ _index == 0 for the first image in the image-list, it should also
+ receive an update when the thumbnail is ready.
+
+commit eed11f083cf41bd016146a600cdb89555949c2bd
+Author: Stephan Arts <step...@xfce.org>
+Date: Sat Aug 4 22:39:00 2012 +0200
+
+ Render a slightly bigger icon, for higher quality
+
+commit 70cd9f0e11c9f67d8a9b29e5a4890f4c70a7b6e5
+Author: Stephan Arts <step...@xfce.org>
+Date: Sat Aug 4 22:26:46 2012 +0200
+
+ Update NEWS
+
+commit 0289e8b8dfd993a75f6bff589e27ccb889912aa4
+Author: Stephan Arts <step...@xfce.org>
+Date: Sat Aug 4 22:09:23 2012 +0200
+
+ Clean up the thumbnailer on shutdown
+
+commit 6b221241e563aa891cbbfd87f4eb01d92354dc4c
+Author: Stephan Arts <step...@xfce.org>
+Date: Sat Aug 4 22:06:55 2012 +0200
+
+ Show current image as icon in taskbar (Bug #8837)
+
+commit c4aac7df6346d322350c11bce41de0ce12bba749
+Author: Stephan Arts <step...@xfce.org>
+Date: Sun Jul 29 22:46:04 2012 +0200
+
+ update NEWS and version number
+
commit cdf0ea88007f439f4b8122da2cdb3e05dbc50a3b
Author: Stephan Arts <step...@xfce.org>
Date: Sun Jul 29 22:40:47 2012 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ristretto-0.6.2/NEWS new/ristretto-0.6.3/NEWS
--- old/ristretto-0.6.2/NEWS 2012-07-29 22:42:30.000000000 +0200
+++ new/ristretto-0.6.3/NEWS 2012-08-05 22:33:06.000000000 +0200
@@ -1,3 +1,8 @@
+0.6.3
+=====
+- Fix bug #8837 (Use thumbnail as appicon)
+- Update the first image in the image-list when receiving a ready-signal.
+
0.6.2
=====
- Fix backport of translations, (I should build before tagging)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ristretto-0.6.2/configure
new/ristretto-0.6.3/configure
--- old/ristretto-0.6.2/configure 2012-07-29 22:42:56.000000000 +0200
+++ new/ristretto-0.6.3/configure 2012-08-05 22:42:49.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ristretto 0.6.2.
+# Generated by GNU Autoconf 2.68 for ristretto 0.6.3.
#
# Copyright (c) 2006-2012
# The Xfce development team. All rights reserved.
@@ -562,8 +562,8 @@
# Identity of this package.
PACKAGE_NAME='ristretto'
PACKAGE_TARNAME='ristretto'
-PACKAGE_VERSION='0.6.2'
-PACKAGE_STRING='ristretto 0.6.2'
+PACKAGE_VERSION='0.6.3'
+PACKAGE_STRING='ristretto 0.6.3'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1376,7 +1376,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 ristretto 0.6.2 to adapt to many kinds of systems.
+\`configure' configures ristretto 0.6.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1450,7 +1450,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ristretto 0.6.2:";;
+ short | recursive ) echo "Configuration of ristretto 0.6.3:";;
esac
cat <<\_ACEOF
@@ -1557,7 +1557,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ristretto configure 0.6.2
+ristretto configure 0.6.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1927,7 +1927,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ristretto $as_me 0.6.2, which was
+It was created by ristretto $as_me 0.6.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2277,7 +2277,7 @@
-RISTRETTO_VERSION=0.6.2
+RISTRETTO_VERSION=0.6.3
am__api_version='1.11'
ac_aux_dir=
@@ -10383,7 +10383,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ristretto $as_me 0.6.2, which was
+This file was extended by ristretto $as_me 0.6.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10449,7 +10449,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ristretto config.status 0.6.2
+ristretto config.status 0.6.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ristretto-0.6.2/configure.in
new/ristretto-0.6.3/configure.in
--- old/ristretto-0.6.2/configure.in 2012-07-29 22:42:52.000000000 +0200
+++ new/ristretto-0.6.3/configure.in 2012-08-05 22:42:44.000000000 +0200
@@ -16,8 +16,8 @@
dnl ***************************
m4_define([ristretto_version_major], [0])
m4_define([ristretto_version_minor], [6])
-m4_define([ristretto_version_micro], [2])
-m4_define([ristretto_version_build], [rcdf0ea8])
+m4_define([ristretto_version_micro], [3])
+m4_define([ristretto_version_build], [r5f302be])
m4_define([ristretto_version_tag], []) # Leave empty for releases
m4_define([ristretto_version],
[ristretto_version_major().ristretto_version_minor().ristretto_version_micro()ifelse(ristretto_version_tag(),
[], [], [ristretto_version_tag()-ristretto_version_build()])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ristretto-0.6.2/src/image_list.c
new/ristretto-0.6.3/src/image_list.c
--- old/ristretto-0.6.2/src/image_list.c 2012-06-01 08:41:20.000000000
+0200
+++ new/ristretto-0.6.3/src/image_list.c 2012-08-04 22:58:42.000000000
+0200
@@ -1718,7 +1718,7 @@
gint index_;
index_ = g_list_index (image_list->priv->images, file);
- if (index_ > 0)
+ if (index_ >= 0)
{
path_ = gtk_tree_path_new();
gtk_tree_path_append_index(path_,index_);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ristretto-0.6.2/src/main_window.c
new/ristretto-0.6.3/src/main_window.c
--- old/ristretto-0.6.2/src/main_window.c 2012-07-26 22:05:52.000000000
+0200
+++ new/ristretto-0.6.3/src/main_window.c 2012-08-04 23:13:39.000000000
+0200
@@ -38,6 +38,7 @@
#include "util.h"
#include "file.h"
#include "icon_bar.h"
+#include "thumbnailer.h"
#include "image_list.h"
#include "image_viewer.h"
#include "main_window.h"
@@ -94,6 +95,7 @@
GtkRecentManager *recent_manager;
RsttoSettings *settings_manager;
RsttoWallpaperManager *wallpaper_manager;
+ RsttoThumbnailer *thumbnailer;
GtkWidget *menubar;
GtkWidget *toolbar;
@@ -161,6 +163,11 @@
cb_compare_app_infos (
gconstpointer a,
gconstpointer b);
+static void
+cb_rstto_thumbnailer_ready(
+ RsttoThumbnailer *thumbnailer,
+ RsttoFile *file,
+ gpointer user_data);
static gboolean
rstto_window_save_geometry_timer (gpointer user_data);
@@ -764,6 +771,7 @@
window->priv->ui_manager = gtk_ui_manager_new ();
window->priv->recent_manager = gtk_recent_manager_get_default();
window->priv->settings_manager = rstto_settings_new();
+ window->priv->thumbnailer = rstto_thumbnailer_new();
/* Setup the image filter list for drag and drop */
window->priv->filter = gtk_file_filter_new ();
@@ -1109,6 +1117,12 @@
G_CALLBACK (cb_rstto_desktop_type_changed),
window);
+ g_signal_connect (
+ G_OBJECT(window->priv->thumbnailer),
+ "ready",
+ G_CALLBACK (cb_rstto_thumbnailer_ready),
+ window);
+
}
static void
@@ -1161,6 +1175,12 @@
g_object_unref (window->priv->filter);
window->priv->filter= NULL;
}
+
+ if (window->priv->thumbnailer)
+ {
+ g_object_unref (window->priv->thumbnailer);
+ window->priv->thumbnailer = NULL;
+ }
g_free (window->priv);
window->priv = NULL;
}
@@ -1247,6 +1267,7 @@
const gchar *id;
GtkWidget *menu_item = NULL;
GDesktopAppInfo *app_info = NULL;
+ const GdkPixbuf *pixbuf = NULL;
GtkWidget *open_with_menu = gtk_menu_new();
GtkWidget *open_with_window_menu = gtk_menu_new();
@@ -1270,6 +1291,17 @@
-1.0,
0);
+ pixbuf = rstto_file_get_thumbnail (cur_file, THUMBNAIL_SIZE_SMALL);
+ if (pixbuf != NULL)
+ {
+ gtk_window_set_icon (GTK_WINDOW (window), gdk_pixbuf_copy
(pixbuf));
+ }
+ else
+ {
+ gtk_window_set_icon (GTK_WINDOW (window), NULL);
+ gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto");
+ }
+
app_list = g_app_info_get_all_for_type (content_type);
editor = rstto_mime_db_lookup (window->priv->db, content_type);
@@ -1334,11 +1366,11 @@
if (count > 1)
{
- title = g_strdup_printf ("%s - %s [%d/%d]",
RISTRETTO_APP_TITLE, file_basename, position+1, count);
+ title = g_strdup_printf ("%s - %s [%d/%d]", file_basename,
RISTRETTO_APP_TITLE, position+1, count);
}
else
{
- title = g_strdup_printf ("%s - %s", RISTRETTO_APP_TITLE,
file_basename);
+ title = g_strdup_printf ("%s - %s", file_basename,
RISTRETTO_APP_TITLE );
}
}
@@ -1358,6 +1390,9 @@
gtk_widget_show_all (open_with_window_menu);
title = g_strdup (RISTRETTO_APP_TITLE);
+
+ gtk_window_set_icon (GTK_WINDOW (window), NULL);
+ gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto");
}
rstto_main_window_update_buttons (window);
@@ -4157,3 +4192,28 @@
{
return g_app_info_equal (G_APP_INFO (a), G_APP_INFO (b)) ? 0 : 1;
}
+
+static void
+cb_rstto_thumbnailer_ready(
+ RsttoThumbnailer *thumbnailer,
+ RsttoFile *file,
+ gpointer user_data)
+{
+ RsttoMainWindow *window = RSTTO_MAIN_WINDOW (user_data);
+ RsttoFile *cur_file = rstto_image_list_iter_get_file (window->priv->iter);
+ const GdkPixbuf *pixbuf = NULL;
+
+ if (file == cur_file)
+ {
+ pixbuf = rstto_file_get_thumbnail (file, THUMBNAIL_SIZE_SMALL);
+ if (pixbuf != NULL)
+ {
+ gtk_window_set_icon (GTK_WINDOW (window), gdk_pixbuf_copy(pixbuf));
+ }
+ else
+ {
+ gtk_window_set_icon (GTK_WINDOW (window), NULL);
+ gtk_window_set_icon_name (GTK_WINDOW (window), "ristretto");
+ }
+ }
+}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
