diff -u f-spot-0.4.1/debian/changelog f-spot-0.4.1/debian/changelog --- f-spot-0.4.1/debian/changelog +++ f-spot-0.4.1/debian/changelog @@ -1,3 +1,10 @@ +f-spot (0.4.1-4ubuntu3) hardy; urgency=low + + * debian/patches/45_about-dialog.dpatch: + - Cherry-picked migration to Gtk.AboutDialog from SVN 3568. (LP: #41825) + + -- Matvey Kozhev Sat, 19 Jan 2008 13:55:24 +0600 + f-spot (0.4.1-4ubuntu2) hardy; urgency=low * debian/patches/30_fix-infinite-loop.dpatch: diff -u f-spot-0.4.1/debian/patches/00list f-spot-0.4.1/debian/patches/00list --- f-spot-0.4.1/debian/patches/00list +++ f-spot-0.4.1/debian/patches/00list @@ -4,6 +4,7 @@ 30_fix-infinite-loop 35_validate-gallery-names 40_flickr-export-crash +45_about-dialog fix_libfspot_linkage fix_libfspoteog_linkage fix_libfspotjpegtran_linkage only in patch2: unchanged: --- f-spot-0.4.1.orig/debian/patches/45_about-dialog.dpatch +++ f-spot-0.4.1/debian/patches/45_about-dialog.dpatch @@ -0,0 +1,122 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 45_about-dialog.dpatch by Stephane Delcroix +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Migrate to Gtk.AboutDialog (upstream SVN 3568) + +@DPATCH@ + +--- trunk/src/MainWindow.cs 2008/01/18 07:47:13 3565 ++++ trunk/src/MainWindow.cs 2008/01/18 12:03:33 3568 +@@ -1593,7 +1593,7 @@ + private static About about = null; + public static void HandleAbout (object sender, EventArgs args) + { +- string [] authors = new string [] { ++/* string [] authors = new string [] { + "Ettore Perazzoli", + "Lawrence Ewing", + "Laurence Hygate", +@@ -1644,6 +1644,8 @@ + PixbufUtils.LoadFromAssembly ("f-spot-logo.svg")); + about.Destroyed += delegate (object o, EventArgs e) {about = null;}; + about.Show (); ++ */ ++ FSpot.UI.Dialog.AboutDialog.ShowUp (); + } + + void HandleTagSizeChange (object sender, EventArgs args) +@@ -3168,3 +3168,93 @@ + args.RetVal = false; + } + } ++ ++namespace FSpot.UI.Dialog ++{ ++ public class AboutDialog : Gtk.AboutDialog ++ { ++ private static AboutDialog about = null; ++ ++ private AboutDialog () { ++ Artists = new string [] { ++ "Jakub Steiner", ++ }; ++ Authors = new string [] { ++ "Primary Development", ++ "\tLawrence Ewing", ++ "\tStephane Delcroix", ++ "", ++ "Active Contributors to this release", ++ "\tLorenzo Milesi", ++ "", ++ "Contributors", ++ "\tAaron Bockover", ++ "\tAlessandro Gervaso", ++ "\tAlex Graveley", ++ "\tAlvaro del Castillo", ++ "\tBen Monnahan", ++ "\tBengt Thuree", ++ "\tChad Files", ++ "\tEttore Perazzoli", ++ "\tEwen Cheslack-Postava", ++ "\tJoe Shaw", ++ "\tJoerg Buesse", ++ "\tJon Trowbridge", ++ "\tJoshua Tauberer", ++ "\tGabriel Burt", ++ "\tGrahm Orr", ++ "\tLaurence Hygate", ++ "\tLee Willis", ++ "\tMartin Willemoes Hansen", ++ "\tMatt Jones", ++ "\tMiguel de Icaza", ++ "\tNat Friedman", ++ "\tPatanjali Somayaji", ++ "\tPeter Johanson", ++ "\tRuben Vermeersch", ++ "\tTambet Ingo", ++ "\tThomas Van Machelen", ++ "\tTodd Berman", ++ "\tVincent Moreau", ++ "\tVladimir Vukicevic", ++ "\tXavier Bouchoux", ++ "", ++ "In memory Of", ++ "\tEttore Perazzoli", ++ }; ++ Comments = "Photo management for GNOME"; ++ Copyright = Catalog.GetString ("Copyright \x00a9 2003-2008 Novell Inc."); ++ Documenters = new string[] { ++ "Aaron Bockover", ++ "Alexandre Prokoudine", ++ "Bengt Thuree", ++ "Gabriel Burt", ++ "Miguel de Icaza", ++ "Stephane Delcroix", ++ }; ++ License = "GPL v2"; ++ Logo = PixbufUtils.LoadFromAssembly ("f-spot-logo.svg"); ++ #if !GTK_2_11 ++ Name = "F-Spot"; ++ #endif ++ TranslatorCredits = Catalog.GetString ("translator-credits"); ++ if (System.String.Compare (TranslatorCredits, "translator-credits") == 0) ++ TranslatorCredits = null; ++ Version = Defines.VERSION; ++ Website = "http://f-spot.org"; ++ WebsiteLabel = Catalog.GetString ("F-Spot Website"); ++ WrapLicense = true; ++ } ++ ++ public static AboutDialog ShowUp () ++ { ++ if (about == null) ++ about = new AboutDialog (); ++ about.Destroyed += delegate (object o, EventArgs e) {about = null;}; ++ about.Response += delegate (object o, Gtk.ResponseArgs e) {if (about != null) about.Destroy ();}; ++ about.Show (); ++ return about; ++ } ++ } ++} ++