- drop obsolete files

Changed files:
    f-spot-delete.patch -> 1.2
    f-spot-dir.patch -> 1.3
    f-spot-exec.patch -> 1.5
    f-spot-fs.patch -> 1.4
    f-spot-r4681.patch -> 1.2

diff --git a/f-spot-delete.patch b/f-spot-delete.patch
deleted file mode 100644 (file)
index 4750cfb..0000000
--- a/f-spot-delete.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Index: src/f-spot.glade
-===================================================================
---- src/f-spot.glade   (wersja 2906)
-+++ src/f-spot.glade   (kopia robocza)
-@@ -1031,7 +1031,7 @@
-         <child>
-           <widget class="GtkTable" id="options_table">
-             <property name="visible">True</property>
--            <property name="n_rows">3</property>
-+            <property name="n_rows">4</property>
-             <property name="n_columns">3</property>
-             <property name="homogeneous">False</property>
-             <property name="row_spacing">5</property>
-@@ -1259,6 +1259,30 @@
-                 <property name="y_options"></property>
-               </packing>
-             </child>
-+
-+            <child>
-+              <widget class="GtkCheckButton" id="delete_files_checkbox">
-+                <property name="visible">True</property>
-+                <property name="tooltip" translatable="yes">Delete imported file from camera</property>
-+                <property name="can_focus">True</property>
-+                <property name="label" translatable="yes">_Delete from camera</property>
-+                <property name="use_underline">True</property>
-+                <property name="relief">GTK_RELIEF_NORMAL</property>
-+                <property name="focus_on_click">True</property>
-+                <property name="active">False</property>
-+                <property name="inconsistent">False</property>
-+                <property name="draw_indicator">True</property>
-+                <signal name="toggled" handler="HandleImportToggled" last_modification_time="Thu, 01 Feb 2007 20:41:45 GMT"/>
-+              </widget>
-+              <packing>
-+                <property name="left_attach">0</property>
-+                <property name="right_attach">1</property>
-+                <property name="top_attach">3</property>
-+                <property name="bottom_attach">4</property>
-+                <property name="x_options">fill</property>
-+                <property name="y_options"></property>
-+              </packing>
-+            </child>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-Index: src/GPhotoCamera.cs
-===================================================================
---- src/GPhotoCamera.cs        (wersja 2906)
-+++ src/GPhotoCamera.cs        (kopia robocza)
-@@ -208,7 +208,18 @@
-               
-               camfile.Save (filename);
-       }
--              
-+      
-+      public void DeleteFile (int index)
-+      {
-+              if (camera_fs == null || files == null || index < 0 || index >= files.Count)
-+                      return;
-+                      
-+              GPhotoCameraFile selected_file = (GPhotoCameraFile)files [index];
-+              camera_fs.DeleteFile (selected_file.Directory,
-+                                    selected_file.FileName,
-+                                    context);
-+      }
-+
-       public void SaveAllFiles (string prefix, int start_number)
-       {               
-               for(int index = 0; index < files.Count; index++) {
-Index: src/CameraFileSelectionDialog.cs
-===================================================================
---- src/CameraFileSelectionDialog.cs   (wersja 2906)
-+++ src/CameraFileSelectionDialog.cs   (kopia robocza)
-@@ -22,6 +22,7 @@
-               [Widget] Gtk.Button save_directory_selection_button;
-               [Widget] Gtk.Entry prefix_entry;
-               [Widget] Gtk.CheckButton import_files_checkbox;
-+              [Widget] Gtk.CheckButton delete_files_checkbox;
-               [Widget] Gtk.Button select_tag_button;
-               
-               GPhotoCamera camera;
-@@ -257,6 +258,9 @@
-                       
-                       camera.SaveFile (index, path);
-                       
-+                      if (delete_files_checkbox.Active)
-+                              camera.DeleteFile (index);
-+                      
-                       string dest = FileImportBackend.ChooseLocation (path);
-                       System.IO.File.Move (path, dest);
-                       path = dest;

diff --git a/f-spot-dir.patch b/f-spot-dir.patch
deleted file mode 100644 (file)
index c74f82a..0000000
--- a/f-spot-dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru f-spot-0.4.4/configure.in f-spot-0.4.4-dir/configure.in
---- f-spot-0.4.4/configure.in  2008-05-27 23:08:19.000000000 +0200
-+++ f-spot-0.4.4-dir/configure.in      2008-05-29 09:29:47.000000000 +0200
-@@ -275,7 +275,7 @@
- if test "$have_gs_pkgconfig" = "yes" && test "x$gs_pc_prefix" = "x$gnome_screensaver_prefix"; then
-       GNOME_SCREENSAVER_SAVERDIR=$gs_pc_saverdir
- elif test -d $gnome_screensaver_prefix/lib/gnome-screensaver; then
--      GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver/gnome-screensaver
-+      GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/lib/gnome-screensaver
- else 
-       GNOME_SCREENSAVER_SAVERDIR=$gnome_screensaver_prefix/libexec/gnome-screensaver
- fi

diff --git a/f-spot-exec.patch b/f-spot-exec.patch
deleted file mode 100644 (file)
index 351090e..0000000
--- a/f-spot-exec.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Nru f-spot-0.4.4/src/f-spot.in f-spot-0.4.4-exec/src/f-spot.in
---- f-spot-0.4.4/src/f-spot.in 2008-05-16 20:52:42.000000000 +0200
-+++ f-spot-0.4.4-exec/src/f-spot.in    2008-05-29 09:26:36.000000000 +0200
-@@ -67,5 +67,5 @@
- elif $run_gdb; then
-       gdb --eval-command=run --args mono $MONO_OPTIONS $EXE_TO_RUN "$@"
- else
--      exec -a @PACKAGE@ $DBUSLAUNCH mono $MONO_OPTIONS $EXE_TO_RUN "$@"
-+      exec $DBUSLAUNCH mono $MONO_OPTIONS $EXE_TO_RUN "$@"
- fi

diff --git a/f-spot-fs.patch b/f-spot-fs.patch
deleted file mode 100644 (file)
index 0bd1c05..0000000
--- a/f-spot-fs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- f-spot-0.4.2/src/MainWindow.cs.orig        2008-02-14 22:26:50.000000000 +0000
-+++ f-spot-0.4.2/src/MainWindow.cs     2008-03-12 14:48:14.000000000 +0000
-@@ -2067,6 +2067,13 @@
-               int active = Math.Max (ActiveIndex (), 0);
-               if (fsview == null) {
-                       fsview = new FSpot.FullScreenView (query);
-+
-+                      Gdk.Screen screen = fsview.Screen;
-+                      int monitor = screen.GetMonitorAtWindow (main_window.GdkWindow);
-+                      Gdk.Rectangle bounds = screen.GetMonitorGeometry(monitor);
-+                      fsview.Move(bounds.X, 0);
-+                      fsview.SetDefaultSize(bounds.Width, bounds.Height);
-+
-                       fsview.Destroyed += HandleFullScreenViewDestroy;
-                       fsview.View.Item.Index = active;
-                       ColorDialog.SwitchViews (fsview.View);
-@@ -2110,6 +2117,13 @@
-               int active = Math.Max (ActiveIndex (), 0);
-               if (fsview == null) {
-                       fsview = new FSpot.FullScreenView (query);
-+
-+                      Gdk.Screen screen = fsview.Screen;
-+                      int monitor = screen.GetMonitorAtWindow (main_window.GdkWindow);
-+                      Gdk.Rectangle bounds = screen.GetMonitorGeometry(monitor);
-+                      fsview.Move(bounds.X, 0);
-+                      fsview.SetDefaultSize(bounds.Width, bounds.Height);
-+
-                       fsview.Destroyed += HandleFullScreenViewDestroy;
-                       fsview.View.Item.Index = active;
-                       ColorDialog.SwitchViews (fsview.View);

diff --git a/f-spot-r4681.patch b/f-spot-r4681.patch
deleted file mode 100644 (file)
index 93a67d2..0000000
--- a/f-spot-r4681.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- trunk/src/MainWindow.cs    2008/11/26 08:58:19     4625
-+++ trunk/src/MainWindow.cs    2008/12/30 21:53:53     4681
-@@ -161,6 +161,8 @@
-       ModeType view_mode;
-       bool write_metadata = false;
- 
-+      Gdk.Cursor watch = new Gdk.Cursor (Gdk.CursorType.Watch);
-+
-       // Tag Icon Sizes
-       public int TagsIconSize {
-               get { return (int) Tag.TagIconSize; }
-@@ -1535,7 +1537,7 @@
- 
-       void HandlePhotoViewUpdateStarted (PhotoView sender)
-       {
--              main_window.GdkWindow.Cursor = new Gdk.Cursor (Gdk.CursorType.Watch);
-+              main_window.GdkWindow.Cursor = watch;
-               // FIXME: use gdk_display_flush() when available
-               main_window.GdkWindow.Display.Sync ();
-       }
-@@ -2822,7 +2824,7 @@
- 
-       public void UpdateQuery ()
-       {
--              main_window.GdkWindow.Cursor = new Gdk.Cursor (Gdk.CursorType.Watch);
-+              main_window.GdkWindow.Cursor = watch;
-               main_window.GdkWindow.Display.Sync ();
-               query.RequestReload ();
-               main_window.GdkWindow.Cursor = null;
-