Hello community,

here is the log from the commit of package shotwell for openSUSE:Factory
checked in at Thu Oct 13 00:01:47 CEST 2011.



--------
--- openSUSE:Factory/shotwell/shotwell.changes  2011-10-02 11:15:38.000000000 
+0200
+++ /mounts/work_src_done/STABLE/shotwell/shotwell.changes      2011-10-12 
11:04:25.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Oct 12 10:44:09 CEST 2011 - dims...@opensuse.org
+
+- Update to version 0.11.3:
+  + Fixes a critical issue where Shotwell could crash immediately
+    following a photo import.
+  + Fixes a critical issue where Shotwell could crash if the user
+    entered a tag name containing a slash ("/") character.
+  + Long error messages in the Publishing dialog box are now
+    wrapped correctly.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  shotwell-0.11.2.tar.bz2

New:
----
  shotwell-0.11.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ shotwell.spec ++++++
--- /var/tmp/diff_new_pack.dhbBcy/_old  2011-10-13 00:01:42.000000000 +0200
+++ /var/tmp/diff_new_pack.dhbBcy/_new  2011-10-13 00:01:42.000000000 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           shotwell
-Version:        0.11.2
+Version:        0.11.3
 Release:        1
 # FIXME: Check if the hack to remove --fatal-warnings is still required. Also 
see http://redmine.yorba.org/issues/3760
 License:        LGPLv2.1+

++++++ shotwell-0.11.2.tar.bz2 -> shotwell-0.11.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/shotwell-0.11.2/Makefile new/shotwell-0.11.3/Makefile
--- old/shotwell-0.11.2/Makefile        2011-09-20 22:33:53.000000000 +0200
+++ new/shotwell-0.11.3/Makefile        2011-10-11 23:41:53.000000000 +0200
@@ -1,7 +1,7 @@
 PROGRAM = shotwell
 PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
 
-VERSION = 0.11.2
+VERSION = 0.11.3
 GETTEXT_PACKAGE = $(PROGRAM)
 BUILD_ROOT = 1
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/shotwell-0.11.2/NEWS new/shotwell-0.11.3/NEWS
--- old/shotwell-0.11.2/NEWS    2011-09-20 22:29:16.000000000 +0200
+++ new/shotwell-0.11.3/NEWS    2011-10-11 23:41:53.000000000 +0200
@@ -1,3 +1,14 @@
+Shotwell 0.11.3 - 11 October 2011 - "All Old People Steal"
+---------------------------------------------------------------------
+
+  * Fixes a critical issue where Shotwell could crash immediately
+    following a photo import
+  * Fixes a critical issue where Shotwell could crash if the user
+    entered a tag name containing a slash ("/") character
+  * Long error messages in the Publishing dialog box are now wrapped
+    correctly
+
+
 Shotwell 0.11.2 - 20 September 2011 - "Strap them to a Rickshaw"
 ---------------------------------------------------------------------
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/shotwell-0.11.2/src/Dialogs.vala 
new/shotwell-0.11.3/src/Dialogs.vala
--- old/shotwell-0.11.2/src/Dialogs.vala        2011-09-20 22:15:40.000000000 
+0200
+++ new/shotwell-0.11.3/src/Dialogs.vala        2011-10-11 23:41:53.000000000 
+0200
@@ -497,7 +497,7 @@
 }
 
 public string get_media_specific_string(Gee.Collection<BatchImportResult> 
import_collection,
-    string photos_msg, string videos_msg, string both_msg, string? 
neither_msg) {
+    string photos_msg, string videos_msg, string both_msg, string neither_msg) 
{
     bool has_photos = import_has_photos(import_collection);
     bool has_videos = import_has_videos(import_collection);
         
@@ -507,10 +507,8 @@
         return photos_msg;
     else if (has_videos)
         return videos_msg;
-    else if (neither_msg != null)
-        return neither_msg;
     else
-        assert_not_reached();
+        return neither_msg;
 }
 
 // Returns true if the user selected the yes action, false otherwise.
@@ -530,7 +528,7 @@
             
manifest.already_imported.size)).printf(manifest.already_imported.size);
 
         message += get_media_specific_string(manifest.already_imported, 
photos_message,
-            videos_message, both_message, null);
+            videos_message, both_message, both_message);
         
         message += generate_import_failure_list(manifest.already_imported, 
show_dest_id);
     }
@@ -671,7 +669,7 @@
             manifest.success.size)).printf(manifest.success.size);
         
         message += get_media_specific_string(manifest.success, photos_message, 
videos_message,
-            both_message, null);
+            both_message, "");
     }
     
     int total = manifest.success.size + manifest.failed.size + 
manifest.camera_failed.size
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/shotwell-0.11.2/src/publishing/PublishingPluginHost.vala 
new/shotwell-0.11.3/src/publishing/PublishingPluginHost.vala
--- old/shotwell-0.11.2/src/publishing/PublishingPluginHost.vala        
2011-09-14 23:35:06.000000000 +0200
+++ new/shotwell-0.11.3/src/publishing/PublishingPluginHost.vala        
2011-10-11 23:41:53.000000000 +0200
@@ -80,7 +80,7 @@
     public void post_error(Error err) {
         string msg = _("Publishing to %s can't continue because an error 
occurred:").printf(
             active_publisher.get_service().get_pluggable_name());
-        msg += GLib.Markup.printf_escaped("\n\n\t<i>%s</i>\n\n", err.message);
+        msg += GLib.Markup.printf_escaped("\n\n<i>%s</i>\n\n", err.message);
         msg += _("To try publishing to another service, select one from the 
above menu.");
         
         dialog.install_pane(new 
PublishingUI.StaticMessagePane.with_pango(msg));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/shotwell-0.11.2/src/publishing/PublishingUI.vala 
new/shotwell-0.11.3/src/publishing/PublishingUI.vala
--- old/shotwell-0.11.2/src/publishing/PublishingUI.vala        2011-09-20 
22:15:39.000000000 +0200
+++ new/shotwell-0.11.3/src/publishing/PublishingUI.vala        2011-10-11 
23:41:53.000000000 +0200
@@ -37,6 +37,7 @@
     public StaticMessagePane.with_pango(string msg) {
         Gtk.Label label = new Gtk.Label(null);
         label.set_markup(msg);
+        label.set_line_wrap(true);
         
         (get_widget() as Gtk.Container).add(label);
     }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/shotwell-0.11.2/src/tags/Branch.vala 
new/shotwell-0.11.3/src/tags/Branch.vala
--- old/shotwell-0.11.2/src/tags/Branch.vala    2011-09-20 22:15:40.000000000 
+0200
+++ new/shotwell-0.11.3/src/tags/Branch.vala    2011-10-11 21:44:35.000000000 
+0200
@@ -224,10 +224,15 @@
         string? prepped = Tag.prep_tag_name(new_name);
         if (prepped == null)
             return;
+
+        prepped = prepped.replace("/", "");
         
         if (prepped == tag.get_user_visible_name())
             return;
         
+        if (prepped == "")
+            return;
+        
         AppWindow.get_command_manager().execute(new RenameTagCommand(tag, 
prepped));
     }
     

continue with "q"...



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to