r15893 - in /desktop/unstable/seahorse/debian: changelog patches/05_focus_windows.patch patches/06_tray_hide_window.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun May 11 01:19:49 2008
New Revision: 15893

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15893
Log:
* 05_focus_windows.patch: force the passphrase prompt and the 
  configuration dialog to get the focus.
* 06_tray_hide_window.patch: hide the status dialog if it is already 
  open when the icon is clicked.

Added:
    desktop/unstable/seahorse/debian/patches/05_focus_windows.patch
    desktop/unstable/seahorse/debian/patches/06_tray_hide_window.patch
Modified:
    desktop/unstable/seahorse/debian/changelog
    desktop/unstable/seahorse/debian/patches/series

Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=15893&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Sun May 11 01:19:49 2008
@@ -1,4 +1,4 @@
-seahorse (2.22.1-2) UNRELEASED; urgency=low
+seahorse (2.22.1-2) unstable; urgency=low
 
   [ Josselin Mouette ]
   * seahorse.Xsession: only start seahorse-agent for GNOME sessions. 
@@ -9,7 +9,13 @@
     - Added, from upstream SVN r2171.
       Fix importing keys from hkp keyservers (Closes: #449461)
 
- -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sat, 10 May 2008 18:37:20 +0200
+  [ Josselin Mouette ]
+  * 05_focus_windows.patch: force the passphrase prompt and the 
+    configuration dialog to get the focus.
+  * 06_tray_hide_window.patch: hide the status dialog if it is already 
+    open when the icon is clicked.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 11 May 2008 03:09:06 +0200
 
 seahorse (2.22.1-1) unstable; urgency=high
 

Added: desktop/unstable/seahorse/debian/patches/05_focus_windows.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/05_focus_windows.patch?rev=15893&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/05_focus_windows.patch (added)
+++ desktop/unstable/seahorse/debian/patches/05_focus_windows.patch Sun May 11 01:19:49 2008
@@ -1,0 +1,29 @@
+GNOME #326611
+
+Index: seahorse-2.22.1/agent/seahorse-agent-prompt.c
+===================================================================
+--- seahorse-2.22.1.orig/agent/seahorse-agent-prompt.c	2008-05-11 02:46:09.351094945 +0200
++++ seahorse-2.22.1/agent/seahorse-agent-prompt.c	2008-05-11 03:00:30.258600896 +0200
+@@ -282,7 +282,7 @@ create_auth_window (SeahorseAgentPassReq
+     gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_CENTER);
+     gtk_window_set_keep_above(GTK_WINDOW (win), TRUE);
+     gtk_widget_show_all (win);
+-    gtk_window_present (GTK_WINDOW (win));
++    gdk_window_focus (win->window, GDK_CURRENT_TIME);
+     return win;
+ }
+ 
+Index: seahorse-2.22.1/libseahorse/seahorse-passphrase.c
+===================================================================
+--- seahorse-2.22.1.orig/libseahorse/seahorse-passphrase.c	2008-05-11 02:46:09.439095571 +0200
++++ seahorse-2.22.1/libseahorse/seahorse-passphrase.c	2008-05-11 03:01:26.222588052 +0200
+@@ -278,8 +278,8 @@ seahorse_passphrase_prompt_show (const g
+ 
+     gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
+     gtk_window_set_keep_above(GTK_WINDOW (dialog), TRUE);
+-    gtk_window_present (GTK_WINDOW (dialog));
+     gtk_widget_show_all (GTK_WIDGET (dialog));
++    gdk_window_focus (GTK_WIDGET (dialog)->window, GDK_CURRENT_TIME);
+ 
+     if (confirm)
+         entry_changed (NULL, dialog);

Added: desktop/unstable/seahorse/debian/patches/06_tray_hide_window.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/06_tray_hide_window.patch?rev=15893&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/06_tray_hide_window.patch (added)
+++ desktop/unstable/seahorse/debian/patches/06_tray_hide_window.patch Sun May 11 01:19:49 2008
@@ -1,0 +1,16 @@
+Index: seahorse-2.22.1/agent/seahorse-agent-status.c
+===================================================================
+--- seahorse-2.22.1.orig/agent/seahorse-agent-status.c	2008-05-11 03:07:16.167093221 +0200
++++ seahorse-2.22.1/agent/seahorse-agent-status.c	2008-05-11 03:08:02.618597528 +0200
+@@ -229,7 +229,10 @@ on_settings_activate (GtkWidget *item, g
+ static void
+ tray_activate (GtkStatusIcon *icon, void *data)
+ {
+-    window_show ();
++    if (g_window)
++        window_destroy ();
++    else
++        window_show ();
+ }
+ 
+ /* Called when icon clicked */

Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=15893&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series (original)
+++ desktop/unstable/seahorse/debian/patches/series Sun May 11 01:19:49 2008
@@ -1,6 +1,8 @@
 01_sharedlib.patch
 03_old_gnupg.patch
 04_ldap_deprecated.patch
+05_focus_windows.patch
+06_tray_hide_window.patch
 08_force_ssh.patch
 10_relibtoolize.patch
 15_fix_find-remote-keys.patch