rpms/krb5-auth-dialog/devel duplicate-id.patch, NONE, 1.1 krb5-auth-dialog.spec, 1.39, 1.40

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	krb5-auth-dialog.spec 
Added Files:
	duplicate-id.patch 
Log Message:
fix prefernces


duplicate-id.patch:
 krb5-auth-dialog-preferences.c   |   10 ++++++++--
 krb5-auth-dialog-preferences.xml |    2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE duplicate-id.patch ---
--- krb5-auth-dialog-0.12/preferences/krb5-auth-dialog-preferences.c	2009-07-02 07:23:37.000000000 -0400
+++ hacked/preferences/krb5-auth-dialog-preferences.c	2009-09-25 08:59:36.214140570 -0400
@@ -735,10 +735,16 @@
 static gboolean
 ka_preferences_dialog_init(KaPreferencesDialog* dialog)
 {
+  GError *error = NULL;
+
   dialog->xml = gtk_builder_new ();
 
-  g_assert(gtk_builder_add_from_file(dialog->xml, KA_DATA_DIR G_DIR_SEPARATOR_S
-                                     PACKAGE "-preferences.xml", NULL));
+  if (!gtk_builder_add_from_file(dialog->xml, KA_DATA_DIR G_DIR_SEPARATOR_S
+                                     PACKAGE "-preferences.xml", &error))
+    {
+      g_warning ("Failed to load UI: %s", error->message);
+      exit (1);
+    }
 
   dialog->dialog = GTK_WIDGET(gtk_builder_get_object (dialog->xml, "krb5_auth_dialog_prefs"));
   g_assert (dialog->dialog);
--- krb5-auth-dialog-0.12/preferences/krb5-auth-dialog-preferences.xml	2009-07-02 07:23:37.000000000 -0400
+++ hacked/preferences/krb5-auth-dialog-preferences.xml	2009-09-25 09:00:31.423885887 -0400
@@ -712,7 +712,7 @@
       <action-widget response="0">button1</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkImage" id="image1">
+  <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="stock">gtk-missing-image</property>
   </object>


Index: krb5-auth-dialog.spec
===================================================================
RCS file: /cvs/pkgs/rpms/krb5-auth-dialog/devel/krb5-auth-dialog.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- krb5-auth-dialog.spec	29 Aug 2009 23:59:28 -0000	1.39
+++ krb5-auth-dialog.spec	25 Sep 2009 13:13:00 -0000	1.40
@@ -6,7 +6,7 @@
 Summary: Kerberos 5 authentication dialog
 Name: krb5-auth-dialog
 Version: 0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: User Interface/X
 URL: https://honk.sigxcpu.org/piki/projects/krb5-auth-dialog/
@@ -28,12 +28,16 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=596306
+Patch0: duplicate-id.patch
+
 %description
 This package contains a dialog that warns the user when their Kerberos
 tickets are about to expire and lets them renew them.
 
 %prep
 %setup -q
+%patch0 -p1 -b .duplicate-id
 
 %build
 %configure
@@ -82,6 +86,9 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %changelog
+* Fri Sep 25 2009 Matthias Clasen <mclasen at redhat.com> - 0.12-2
+- Fix the preferences dialog
+
 * Sat Aug 29 2009 Matthias Clasen <mclasen at redhat.com> - 0.12-1
 - Update to 0.12
 - Rebuild against new libnm_glib