[git] GPA - branch, master, updated. gpa-0.9.4-40-g7ac3b9c

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Assistant".

The branch, master has been updated
       via  7ac3b9c22e7dce33875fe6740c473a378763a905 (commit)
      from  63592f5afe2e4415bb3962b87bf461d56c099aed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7ac3b9c22e7dce33875fe6740c473a378763a905
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jun 25 14:33:34 2014 +0200

    Fix warnings if build without card manager support
    
    * src/clipboard.c (clipboard_action_new) [ENABLE_CARD_MANAGER]:
    Exclude WindowsCardManager item.
    * src/fileman.c (fileman_action_new): Ditto.
    * src/keymanager.c (key_manager_action_new): Ditto.

diff --git a/src/clipboard.c b/src/clipboard.c
index 3b756b3..036b905 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -837,7 +837,9 @@ clipboard_action_new (GpaClipboard *clipboard,
     "      <menuitem action='WindowsKeyringEditor'/>"
     "      <menuitem action='WindowsFileManager'/>"
     "      <menuitem action='WindowsClipboard'/>"
+#ifdef ENABLE_CARD_MANAGER
     "      <menuitem action='WindowsCardManager'/>"
+#endif
     "    </menu>"
     "    <menu action='Help'>"
 #if 0
@@ -868,7 +870,9 @@ clipboard_action_new (GpaClipboard *clipboard,
     "    <separator/>"
     "    <toolitem action='WindowsKeyringEditor'/>"
     "    <toolitem action='WindowsFileManager'/>"
+#ifdef ENABLE_CARD_MANAGER
     "    <toolitem action='WindowsCardManager'/>"
+#endif
 #if 0
     "    <toolitem action='HelpContents'/>"
 #endif
@@ -911,8 +915,10 @@ clipboard_action_new (GpaClipboard *clipboard,
   g_object_set (action, "short_label", _("Keyring"), NULL);
   action = gtk_action_group_get_action (action_group, "WindowsFileManager");
   g_object_set (action, "short_label", _("Files"), NULL);
+#ifdef ENABLE_CARD_MANAGER
   action = gtk_action_group_get_action (action_group, "WindowsCardManager");
   g_object_set (action, "short_label", _("Card"), NULL);
+#endif
 
   /* Take care of sensitiveness of widgets.  */
   action = gtk_action_group_get_action (action_group, "EditCut");
diff --git a/src/fileman.c b/src/fileman.c
index d894742..cd00d0c 100644
--- a/src/fileman.c
+++ b/src/fileman.c
@@ -559,7 +559,9 @@ fileman_action_new (GpaFileManager *fileman, GtkWidget **menubar,
     "      <menuitem action='WindowsKeyringEditor'/>"
     "      <menuitem action='WindowsFileManager'/>"
     "      <menuitem action='WindowsClipboard'/>"
+#ifdef ENABLE_CARD_MANAGER
     "      <menuitem action='WindowsCardManager'/>"
+#endif
     "    </menu>"
     "    <menu action='Help'>"
 #if 0
@@ -581,7 +583,9 @@ fileman_action_new (GpaFileManager *fileman, GtkWidget **menubar,
     "    <separator/>"
     "    <toolitem action='WindowsKeyringEditor'/>"
     "    <toolitem action='WindowsClipboard'/>"
+#ifdef ENABLE_CARD_MANAGER
     "    <toolitem action='WindowsCardManager'/>"
+#endif
 #if 0
     "    <toolitem action='HelpContents'/>"
 #endif
@@ -622,8 +626,10 @@ fileman_action_new (GpaFileManager *fileman, GtkWidget **menubar,
   /* Fixup the icon theme labels which are too long for the toolbar.  */
   action = gtk_action_group_get_action (action_group, "WindowsKeyringEditor");
   g_object_set (action, "short_label", _("Keyring"), NULL);
+#ifdef ENABLE_CARD_MANAGER
   action = gtk_action_group_get_action (action_group, "WindowsCardManager");
   g_object_set (action, "short_label", _("Card"), NULL);
+#endif
 
   /* Take care of sensitiveness of widgets.  */
   action = gtk_action_group_get_action (action_group, "FileSign");
diff --git a/src/keymanager.c b/src/keymanager.c
index d5c9f96..84baf6a 100644
--- a/src/keymanager.c
+++ b/src/keymanager.c
@@ -242,6 +242,7 @@ key_manager_has_single_selection (gpointer param)
   return gpa_keylist_has_single_selection (self->keylist);
 }
 
+
 /* Return TRUE if the key list widget of the key manager has
    exactly one selected OpenPGP item.  Usable as a sensitivity
    callback.  */
@@ -990,7 +991,9 @@ key_manager_action_new (GpaKeyManager *self,
     "      <menuitem action='WindowsKeyringEditor'/>"
     "      <menuitem action='WindowsFileManager'/>"
     "      <menuitem action='WindowsClipboard'/>"
+#ifdef ENABLE_CARD_MANAGER
     "      <menuitem action='WindowsCardManager'/>"
+#endif
     "    </menu>"
 #ifdef ENABLE_KEYSERVER_SUPPORT
     "    <menu action='Server'>"
@@ -1021,7 +1024,9 @@ key_manager_action_new (GpaKeyManager *self,
     "    <separator/>"
     "    <toolitem action='WindowsFileManager'/>"
     "    <toolitem action='WindowsClipboard'/>"
+#ifdef ENABLE_CARD_MANAGER
     "    <toolitem action='WindowsCardManager'/>"
+#endif
 #if 0
     "    <toolitem action='HelpContents'/>"
 #endif
@@ -1095,8 +1100,10 @@ key_manager_action_new (GpaKeyManager *self,
   g_object_set (action, "short_label", _("Import"), NULL);
   action = gtk_action_group_get_action (action_group, "WindowsFileManager");
   g_object_set (action, "short_label", _("Files"), NULL);
+#ifdef ENABLE_CARD_MANAGER
   action = gtk_action_group_get_action (action_group, "WindowsCardManager");
   g_object_set (action, "short_label", _("Card"), NULL);
+#endif
 
   /* Take care of sensitiveness of widgets.  */
   action = gtk_action_group_get_action (action_group, "EditCopy");

-----------------------------------------------------------------------

Summary of changes:
 src/clipboard.c  |    6 ++++++
 src/fileman.c    |    6 ++++++
 src/keymanager.c |    7 +++++++
 3 files changed, 19 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Assistant
http://git.gnupg.org