rpms/krb5-auth-dialog/F-11 invisible-char.patch, NONE, 1.1 panel-settle.patch, NONE, 1.1 krb5-auth-dialog.spec, 1.33, 1.34

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/krb5-auth-dialog/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2855

Modified Files:
	krb5-auth-dialog.spec 
Added Files:
	invisible-char.patch panel-settle.patch 
Log Message:
Cosmetic fixes


invisible-char.patch:

--- NEW FILE invisible-char.patch ---
diff -up krb5-auth-dialog-0.8/src/krb5-auth-dialog.c.invisible-char krb5-auth-dialog-0.8/src/krb5-auth-dialog.c
--- krb5-auth-dialog-0.8/src/krb5-auth-dialog.c.invisible-char	2009-04-23 14:20:57.404528539 -0400
+++ krb5-auth-dialog-0.8/src/krb5-auth-dialog.c	2009-04-23 14:26:37.969746065 -0400
@@ -270,6 +270,7 @@ krb5_auth_dialog_setup (Krb5AuthApplet *
 {
 	GtkWidget *entry;
 	GtkWidget *label;
+	GtkWidget *e;
 	gchar *wrong_text;
 	gchar *wrong_markup;
 	gchar *prompt;
@@ -298,6 +299,11 @@ krb5_auth_dialog_setup (Krb5AuthApplet *
 	entry = glade_xml_get_widget (applet->pw_xml, "krb5_entry");
 	gtk_secure_entry_set_text (GTK_SECURE_ENTRY (entry), "");
 
+	e = gtk_entry_new ();
+	gtk_secure_entry_set_invisible_char (GTK_SECURE_ENTRY (entry),
+	                                     gtk_entry_get_invisible_char (GTK_ENTRY (e)));
+	gtk_widget_destroy (e);
+
 	/* Use the prompt label that krb5 provides us */
 	label = glade_xml_get_widget (applet->pw_xml, "krb5_message_label");
 	gtk_label_set_text (GTK_LABEL (label), prompt);

panel-settle.patch:

--- NEW FILE panel-settle.patch ---
diff -up krb5-auth-dialog-0.8/src/krb5-auth-notify.c.panel-settle krb5-auth-dialog-0.8/src/krb5-auth-notify.c
--- krb5-auth-dialog-0.8/src/krb5-auth-notify.c.panel-settle	2009-01-11 16:46:19.000000000 -0500
+++ krb5-auth-dialog-0.8/src/krb5-auth-notify.c	2009-04-23 14:09:29.536749401 -0400
@@ -24,6 +24,19 @@
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 
+static gboolean
+show_notification (Krb5AuthApplet *applet)
+{
+        /* wait for the panel to be settled before showing a bubble */
+        if (gtk_status_icon_is_embedded (applet->tray_icon)) {
+                notify_notification_show (applet->notification, NULL);
+        }
+        else {
+                g_timeout_add_seconds (5, (GSourceFunc)show_notification, applet);
+        }
+        return FALSE;
+}
+
 void
 ka_send_event_notification (Krb5AuthApplet *applet,
 			    const char *summary,
@@ -50,7 +63,7 @@ ka_send_event_notification (Krb5AuthAppl
 		notify_notification_new_with_status_icon(summary, message, notify_icon, applet->tray_icon);
 
         notify_notification_set_urgency (applet->notification, NOTIFY_URGENCY_NORMAL);
-        notify_notification_show (applet->notification, NULL);
+        show_notification (applet);
 }
 
 #else /* HAVE_LIBNOTIFY */


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/F-11/krb5-auth-dialog.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- krb5-auth-dialog.spec	25 Feb 2009 11:59:23 -0000	1.33
+++ krb5-auth-dialog.spec	23 Apr 2009 18:32:01 -0000	1.34
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.8
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: http://www.redhat.com/
@@ -27,7 +27,10 @@
 Requires(post): GConf2
 Requires(preun): GConf2
 
-Patch2: desktop-file-comment.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=580004
+Patch0: panel-settle.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=538339
+Patch1: invisible-char.patch
 
 %description
 This package contains a dialog that warns the user when their Kerberos
@@ -35,18 +38,20 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .panel-settle
+%patch1 -p1 -b .invisible-char
 
 %build
 %configure
 make
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %name
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %name.lang
@@ -79,6 +84,10 @@
 fi
 
 %changelog
+* Thu Apr 23 2009 Matthias Clasen <mclasen at redhatcom> - 0.8-4
+- Don't show bubbles before the icon is there
+- Use the same invisible char as the rest of the world
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild