[SCM] kamoso packaging branch, master, updated. 7d9a4ecbfbc61107c57755a1d0afa540ff44d0aa

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 05854213ed658c79d37cc8628608500fae02877d
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Jul 22 23:34:24 2011 +0200

    Add about_dialog.diff
---
 debian/patches/about_dialog.diff |   27 +++++++++++++++++++++++++++
 debian/patches/series            |    1 +
 2 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/debian/patches/about_dialog.diff b/debian/patches/about_dialog.diff
new file mode 100644
index 0000000..b2e4704
--- /dev/null
+++ b/debian/patches/about_dialog.diff
@@ -0,0 +1,27 @@
+commit 990462363724a09cfbc314d7e6451a4000db548e
+Author: José Manuel Santamaría Lema <panfaust at gmail.com>
+Date:   Fri Jul 22 20:09:22 2011 +0200
+
+    Make the About dialog work.
+
+diff --git a/src/kamoso.cpp b/src/kamoso.cpp
+index ae4c048..6026bdd 100644
+--- a/src/kamoso.cpp
++++ b/src/kamoso.cpp
+@@ -670,7 +670,8 @@ void Kamoso::settingsMenu(bool )
+         m.addSeparator();
+     }
+     m.addAction(KIcon("configure"), i18n("Settings"), this, SLOT(configuration()));
+-    m.addMenu(customHelpMenu());
++    KMenu *help = helpMenu();
++    m.addMenu(help);
+ 
+     m.exec(mainWidgetUi->configure->parentWidget()->mapToGlobal(mainWidgetUi->configure->geometry().bottomLeft()));
+ }
+@@ -726,4 +727,4 @@ void Kamoso::updateThumbnails(const KUrl::List& urls)
+ 
+         mainWidgetUi->thumbnailView->update(idx);
+     }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..848d858
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+about_dialog.diff

-- 
kamoso packaging