Hello community,
here is the log from the commit of package f-spot
checked in at Fri Jun 23 01:08:08 CEST 2006.
--------
--- GNOME/f-spot/f-spot.changes 2006-06-19 05:13:15.000000000 +0200
+++ f-spot/f-spot.changes 2006-06-22 22:19:47.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Jun 22 22:19:27 CEST 2006 - gekker@suse.de
+
+- Update translations for cs, hu
+
+-------------------------------------------------------------------
+Thu Jun 22 20:56:13 CEST 2006 - gekker@suse.de
+
+- Fix 0 byte importugly patch (#186718)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ f-spot.spec ++++++
--- /var/tmp/diff_new_pack.up5nbq/_old 2006-06-23 01:07:40.000000000 +0200
+++ /var/tmp/diff_new_pack.up5nbq/_new 2006-06-23 01:07:40.000000000 +0200
@@ -19,7 +19,7 @@
Autoreqprov: on
Requires: dcraw
Version: 0.1.11
-Release: 36
+Release: 37
Summary: GNOME Photo Management Application
URL: http://www.gnome.org/projects/f-spot/
Source: %{name}-%{version}.tar.bz2
@@ -170,6 +170,10 @@
%endif
%changelog -n f-spot
+* Thu Jun 22 2006 - gekker@suse.de
+- Update translations for cs, hu
+* Thu Jun 22 2006 - gekker@suse.de
+- Fix 0 byte importugly patch (#186718)
* Mon Jun 19 2006 - lewing@suse.de
- Fix startup notification for f-spot in the remote control case. (#185212)
- Add HigMessageDialog.cs to POTFILES.in (#181163)
++++++ f-spot-importugly.patch ++++++
--- /var/tmp/diff_new_pack.up5nbq/_old 2006-06-23 01:07:41.000000000 +0200
+++ /var/tmp/diff_new_pack.up5nbq/_new 2006-06-23 01:07:41.000000000 +0200
@@ -0,0 +1,176 @@
+Index: src/ImportCommand.cs
+===================================================================
+RCS file: /cvs/gnome/f-spot/src/ImportCommand.cs,v
+retrieving revision 1.59.2.3
+diff -u -p -r1.59.2.3 ImportCommand.cs
+--- src/ImportCommand.cs 2 Jun 2006 20:06:58 -0000 1.59.2.3
++++ src/ImportCommand.cs 2 Jun 2006 20:41:40 -0000
+@@ -372,7 +372,7 @@ public class ImportCommand : FSpot.Glade
+ public ImportCommand (Gtk.Window mw)
+ {
+ main_window = mw;
+- step = new FSpot.Delay (10, new GLib.IdleHandler (Step));
++ step = new FSpot.Delay (new GLib.IdleHandler (Step));
+ idle_start = new FSpot.Delay (new IdleHandler (Start));
+ loading_string = Catalog.GetString ("Loading {0} of {1}");
+ }
+@@ -417,6 +417,7 @@ public class ImportCommand : FSpot.Glade
+ // with the recursive DoImport loops we sometimes get into
+ ongoing = importer.Step (out photo, out thumbnail, out count);
+ } catch (ImportException e){
++ System.Console.WriteLine (e);
+ return false;
+ }
+
+@@ -437,6 +438,10 @@ public class ImportCommand : FSpot.Glade
+ return true;
+ else {
+ System.Console.WriteLine ("Stopping");
++ if (progress_bar != null)
++ progress_bar.Text = Catalog.GetString ("Done Loading");
++
++ AllowFinish = true;
+ return false;
+ }
+ }
+@@ -465,8 +470,6 @@ public class ImportCommand : FSpot.Glade
+ collection.Clear ();
+ collection.Capacity = total;
+
+- FSpot.ThumbnailGenerator.Default.PushBlock ();
+-
+ while (total > 0 && this.Step ()) {
+ System.DateTime start_time = System.DateTime.Now;
+ System.TimeSpan span = start_time - start_time;
+@@ -477,23 +480,20 @@ public class ImportCommand : FSpot.Glade
+ }
+ }
+
+- FSpot.ThumbnailGenerator.Default.PopBlock ();
+-
+- if (progress_bar != null)
+- progress_bar.Text = Catalog.GetString ("Done Loading");
+-
+- AllowFinish = true;
+-
+ return total;
+ }
+
+ public void Finish ()
+ {
++ if (idle_start.IsPending || step.IsPending) {
++ AllowFinish = false;
++ return;
++ }
++
+ if (importer != null)
+ importer.Finish ();
+
+ importer = null;
+-
+ }
+
+ public void HandleTagToggled (object o, EventArgs args)
+@@ -732,16 +732,21 @@ public class ImportCommand : FSpot.Glade
+ if (recurse_check != null)
+ recurse = recurse_check.Active;
+
+- if (collection == null)
+- return false;
++ importer = new FileImportBackend (store, pathimport, copy, recurse, null);
++ AllowFinish = false;
++
++ total = importer.Prepare ();
++
++ if (total > 0)
++ UpdateProgressBar (1, total);
++
++ collection.Clear ();
++ collection.Capacity = total;
+
+- DoImport (new FileImportBackend (store, pathimport, copy, recurse, null));
++ if (total > 0)
++ step.Start ();
++
+ return false;
+- }
+-
+- public int ImportFromPaths (PhotoStore store, string [] paths)
+- {
+- return ImportFromPaths (store, paths, null);
+ }
+
+ public int ImportFromPaths (PhotoStore store, string [] paths, bool copy)
+diff -u /usr/src/packages/BUILD/f-spot-0.1.11/src/f-spot.glade /home/lewing/repo/f-spot/src/f-spot.glade
+--- /usr/src/packages/BUILD/f-spot-0.1.11/src/f-spot.glade 2006-06-03 00:07:31.000000000 -0500
++++ /home/lewing/repo/f-spot/src/f-spot.glade 2006-06-02 15:00:04.000000000 -0500
+@@ -3372,6 +3372,22 @@
+ <property name="fill">False</property>
+ </packing>
+ </child>
++
++ <child>
++ <widget class="GtkButton" id="edit_button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-edit</property>
++ <property name="use_stock">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
++ </widget>
++ <packing>
++ <property name="padding">0</property>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+@@ -4096,6 +4112,19 @@
+ </child>
+
+ <child>
++ <widget class="GtkButton" id="remove_button">
++ <property name="visible">True</property>
++ <property name="can_default">True</property>
++ <property name="can_focus">True</property>
++ <property name="label">gtk-remove</property>
++ <property name="use_stock">True</property>
++ <property name="relief">GTK_RELIEF_NORMAL</property>
++ <property name="focus_on_click">True</property>
++ <property name="response_id">-2</property>
++ </widget>
++ </child>
++
++ <child>
+ <widget class="GtkButton" id="add_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+diff -u /usr/src/packages/BUILD/f-spot-0.1.11/src/ImportCommand.cs /home/lewing/repo/f-spot/src/ImportCommand.cs
+--- /usr/src/packages/BUILD/f-spot-0.1.11/src/ImportCommand.cs 2006-06-03 00:07:32.000000000 -0500
++++ /home/lewing/repo/f-spot/src/ImportCommand.cs 2006-06-02 15:49:36.000000000 -0500
+@@ -428,11 +428,11 @@
+ collection.Add (photo);
+
+ //grid.AddThumbnail (thumbnail);
+- if (count < total)
+- UpdateProgressBar (count + 1, total);
+
+ thumbnail.Dispose ();
+ }
++ if (count < total)
++ UpdateProgressBar (count + 1, total);
+
+ if (ongoing && total > 0)
+ return true;
+@@ -725,6 +725,9 @@
+ string [] pathimport = {ImportPath};
+ //this.Dialog.Destroy();
+
++ if (copy_check != null)
++ copy = copy_check.Active;
++
+ bool recurse = true;
+ if (recurse_check != null)
+ recurse = recurse_check.Active;
++++++ f-spot-po.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/po/cs.po new/po/cs.po
--- old/po/cs.po 2006-06-16 18:17:39.000000000 +0200
+++ new/po/cs.po 2006-06-22 22:16:32.000000000 +0200
@@ -12,7 +12,7 @@
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2006-06-16 16:16+0000\n"
-"PO-Revision-Date: 2006-06-12 10:46+0200\n"
+"PO-Revision-Date: 2006-06-20 17:22+0200\n"
"Last-Translator: Jakub Friedl
participants (1)
-
root@suse.de