[Pkg-gnupg-commit] [gpa] 04/05: Remove enable_cardman_close patch, applied upstream

[Andreas Rönnquist]

This is an automated email from the git hooks/post-receive script.

gusnan pushed a commit to branch master
in repository gpa.

commit 4a94178e0417549e641ac00b26a9b5cad82b5ccb
Author: Andreas Rönnquist <gusnan at gusnan.se>
Date:   Fri Nov 21 14:44:21 2014 +0100

    Remove enable_cardman_close patch, applied upstream
---
 debian/changelog                          |  1 +
 debian/patches/enable_cardman_close.patch | 48 -------------------------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 855d075..f5bf269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gpa (0.9.6-1) UNRELEASED; urgency=medium
 
   * New Upstream Version
+  * Remove patch enable_cardman_close.patch - applied upstream
 
  -- Andreas Rönnquist <gusnan at debian.org>  Fri, 21 Nov 2014 14:35:20 +0100
 
diff --git a/debian/patches/enable_cardman_close.patch b/debian/patches/enable_cardman_close.patch
deleted file mode 100644
index cf0979a..0000000
--- a/debian/patches/enable_cardman_close.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 15dc36811b2479e07d71f35ae97ee384c1e51b7b
-Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
-Date:   Mon Sep 1 20:17:51 2014 -0400
-
-    GPA: add a File|Close option to the card manager
-    
-    All the other windows have a File|Close option, but the card manager
-    only has File|Quit.  As a result, a user who tries to close the card
-    manager from the menubar will most likely shut down all of GPA, which
-    may not be their intent.
-
-diff --git a/src/cardman.c b/src/cardman.c
-index c752442..844a44a 100644
---- a/src/cardman.c
-+++ b/src/cardman.c
-@@ -624,6 +624,15 @@ watcher_cb (void *opaque, const char *filename, const char *reason)
- }
- 
- 
-+/* Handle menu item "File/Close".  */
-+static void
-+file_close (GtkAction *action, gpointer param)
-+{
-+  GpaCardManager *cardman = param;
-+  gtk_widget_destroy (GTK_WIDGET (cardman));
-+}
-+
-+
- /* Construct the card manager menu and toolbar widgets and return
-    them. */
- static void
-@@ -638,6 +647,8 @@ cardman_action_new (GpaCardManager *cardman, GtkWidget **menubar,
-       { "Card", NULL, N_("_Card"), NULL },
- 
-       /* File menu.  */
-+      { "FileClose", GTK_STOCK_CLOSE, NULL, NULL,
-+	N_("Close the window"), G_CALLBACK (file_close) },
-       { "FileQuit", GTK_STOCK_QUIT, NULL, NULL,
- 	N_("Quit the program"), G_CALLBACK (gtk_main_quit) },
- 
-@@ -652,6 +663,7 @@ cardman_action_new (GpaCardManager *cardman, GtkWidget **menubar,
-     "<ui>"
-     "  <menubar name='MainMenu'>"
-     "    <menu action='File'>"
-+    "      <menuitem action='FileClose'/>"
-     "      <menuitem action='FileQuit'/>"
-     "    </menu>"
-     "    <menu action='Edit'>"
diff --git a/debian/patches/series b/debian/patches/series
index f4ae03f..6995f07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 gnupg2.patch
 add_desktop_file_keywords.patch
-enable_cardman_close.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpa.git