[Pkg-cli-apps-commits] r3546 - in /packages/f-spot/trunk/debian: changelog patches/00list patches/20_refresh-menus-on-extensions.dpatch
meebey at users.alioth.debian.org
meebey at users.alioth.debian.org
Tue Dec 11 19:34:17 UTC 2007
Author: meebey
Date: Tue Dec 11 19:34:17 2007
New Revision: 3546
URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=3546
Log:
- added patch from Sikon
Added:
packages/f-spot/trunk/debian/patches/20_refresh-menus-on-extensions.dpatch
Modified:
packages/f-spot/trunk/debian/changelog
packages/f-spot/trunk/debian/patches/00list
Modified: packages/f-spot/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/changelog?rev=3546&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/changelog (original)
+++ packages/f-spot/trunk/debian/changelog Tue Dec 11 19:34:17 2007
@@ -1,22 +1,26 @@
-f-spot (0.4.1-1~pre1) UNRELEASED; urgency=low
+f-spot (0.4.1-1~pre2) UNRELEASED; urgency=low
[ Mirco Bauer ]
* debian/control:
+ Added myself to Uploaders.
+ Updated cli-common-dev build-dependency to >= 0.4.4.
- + Updated Standards-Version to 3.7.3, no changed needed.
+ + Updated Standards-Version to 3.7.3, no changes needed.
+ Added sqlite and sqlite3 to Suggests, needed for the
f-spot-sqlite-upgrade script.
* debian/patches/01_build-system.dpatch:
+ Disabled as upstream allows to link against system ndesk-dbus now.
* debian/patches/10_cs-changes.dpatch:
- + Disabled as PicasaWeb export, .kdc file support and sqlite3 handling are
+ + Disabled as PicasaWeb export, .kdc file support and sqlite3 support are
already fixed upstream.
* Added beagle-dev to build-dependencies for beagle support.
* debian/patches/fix_libfspot_linkage.dpatch
debian/patches/fix_libfspoteog_linkage.dpatch
debian/patches/fix_libfspotjpegtran_linkage.dpatch:
+ Created patch to link correctly against used libraries.
+ * debian/patches/20_refresh-menus-on-extensions.dpatch:
+ + Refresh the Export and Tools menus on new or removed extensions.
+ (upstream SVN revision: 3478)
+ (thanks to Matvey Kozhev <sikon at lucidfox.org> for the dpatch and investigation)
* debian/rules:
+ Pass --as-needed to linker for lesser dependencies.
@@ -33,7 +37,7 @@
+ Add new Homepage field.
+ Add new Vcs-* fields.
- -- Tim Retout <tim at retout.co.uk> Tue, 11 Dec 2007 19:18:27 +0000
+ -- Mirco Bauer <meebey at debian.org> Tue, 11 Dec 2007 20:32:53 +0100
f-spot (0.3.5-1.2) unstable; urgency=low
Modified: packages/f-spot/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/00list?rev=3546&op=diff
==============================================================================
--- packages/f-spot/trunk/debian/patches/00list (original)
+++ packages/f-spot/trunk/debian/patches/00list Tue Dec 11 19:34:17 2007
@@ -2,3 +2,4 @@
fix_libfspot_linkage
fix_libfspoteog_linkage
fix_libfspotjpegtran_linkage
+20_refresh-menus-on-extensions.dpatch
Added: packages/f-spot/trunk/debian/patches/20_refresh-menus-on-extensions.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/f-spot/trunk/debian/patches/20_refresh-menus-on-extensions.dpatch?rev=3546&op=file
==============================================================================
--- packages/f-spot/trunk/debian/patches/20_refresh-menus-on-extensions.dpatch (added)
+++ packages/f-spot/trunk/debian/patches/20_refresh-menus-on-extensions.dpatch Tue Dec 11 19:34:17 2007
@@ -1,0 +1,97 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_refresh-menus-on-extensions.dpatch by Stephane Delcroix <sdelcroix at novell.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Refresh the Export and Tools menus on new or removed extensions (upstream SVN 3478)
+
+ at DPATCH@
+
+--- trunk/src/MainWindow.cs 2007/12/05 11:08:58 3472
++++ trunk/src/MainWindow.cs 2007/12/07 12:37:10 3478
+@@ -433,24 +433,8 @@
+ this.selection.Changed += HandleSelectionChanged;
+ this.selection.ItemsChanged += HandleSelectionItemsChanged;
+
+- try {
+- if (export.Submenu != null)
+- export.RemoveSubmenu ();
+-
+- export.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Exports") as FSpot.Extensions.SubmenuNode).GetMenuItem ().Submenu;
+- } catch {
+- Console.WriteLine ("There's (maybe) something wrong with some of the installed extensions. You can try removing the directory addin-db-000 from ~/.gnome2/f-spot/");
+- }
+-
+- try {
+- if (tools.Submenu != null)
+- tools.RemoveSubmenu ();
+-
+- tools.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Tools") as FSpot.Extensions.SubmenuNode).GetMenuItem ().Submenu;
+- } catch {
+- Console.WriteLine ("There's (maybe) something wrong with some of the installed extensions. You can try removing the directory addin-db-000 from ~/.gnome2/f-spot/");
+- tools.Visible = false;
+- }
++ Mono.Addins.AddinManager.ExtensionChanged += PopulateExtendableMenus;
++ PopulateExtendableMenus (null, null);
+
+ UpdateMenus ();
+
+@@ -2918,6 +2902,27 @@
+ //}
+ }
+
++ void PopulateExtendableMenus (object o, EventArgs args)
++ {
++ try {
++ if (export.Submenu != null)
++ export.Submenu.Dispose ();
++ if (tools.Submenu != null)
++ tools.RemoveSubmenu ();
++
++ export.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Exports") as FSpot.Extensions.SubmenuNode).GetSubmenu ();
++ export.Submenu.ShowAll ();
++
++ tools.Submenu = (Mono.Addins.AddinManager.GetExtensionNode ("/FSpot/Menus/Tools") as FSpot.Extensions.SubmenuNode).GetSubmenu ();
++ tools.Submenu.ShowAll ();
++
++ tools.Visible = (tools.Submenu as Menu).Children.Length > 0;
++ } catch {
++ Console.WriteLine ("There's (maybe) something wrong with some of the installed extensions. You can try removing the directory addin-db-000 from ~/.gnome2/f-spot/");
++ tools.Visible = false;
++ }
++ }
++
+ public void HandleOpenWith (object sender, Gnome.Vfs.MimeApplication mime_application)
+ {
+ Photo[] selected = SelectedPhotos ();
+
+--- trunk/src/Extensions/MenuNode.cs 2007/07/26 08:03:48 3250
++++ trunk/src/Extensions/MenuNode.cs 2007/12/07 12:37:10 3478
+@@ -25,15 +25,25 @@
+ {
+ public override Gtk.MenuItem GetMenuItem ()
+ {
+- Gtk.MenuItem item = base.GetMenuItem ();;
++ Gtk.MenuItem item = base.GetMenuItem ();
++
++ Gtk.Menu submenu = GetSubmenu ();
+
++ if (item.Submenu != null)
++ item.Submenu.Dispose ();
++
++ item.Submenu = submenu;
++ return item;
++ }
++
++ public Gtk.Menu GetSubmenu ()
++ {
+ Gtk.Menu submenu = new Gtk.Menu ();
+
+ foreach (MenuNode node in ChildNodes)
+ submenu.Insert (node.GetMenuItem (), -1);
+
+- item.Submenu = submenu;
+- return item;
++ return submenu;
+ }
+ }
+
More information about the Pkg-cli-apps-commits
mailing list