rpms/system-config-language/devel dialogue-center-493824.patch, NONE, 1.1 system-config-language.spec, 1.49, 1.50

Pravin Satpute pravins at fedoraproject.org
Mon May 25 09:14:51 UTC 2009


Author: pravins

Update of /cvs/pkgs/rpms/system-config-language/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25919

Modified Files:
	system-config-language.spec 
Added Files:
	dialogue-center-493824.patch 
Log Message:
* Mon May 25 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.2-6
- fix bug 493824


dialogue-center-493824.patch:

--- NEW FILE dialogue-center-493824.patch ---
diff -rup system-config-language-1.3.2/src/gui_install.py system-config-language-1.3.2_mod/src/gui_install.py
--- system-config-language-1.3.2/src/gui_install.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/gui_install.py	2009-05-25 13:53:35.000000000 +0530
@@ -59,8 +59,8 @@ class guiInstall(yum.YumBase):
         self.unsignedok = False        
                   
    
-    def is_group_installed(self, grpid):         
-        d = gtk.MessageDialog(None, 
+    def is_group_installed(self, grpid, mainwin):         
+        d = gtk.MessageDialog(mainwin, 
                               gtk.DIALOG_MODAL,
                               gtk.MESSAGE_INFO,
                               message_format = _("Note:"))
diff -rup system-config-language-1.3.2/src/language_gui.py system-config-language-1.3.2_mod/src/language_gui.py
--- system-config-language-1.3.2/src/language_gui.py	2008-09-16 17:55:22.000000000 +0530
+++ system-config-language-1.3.2_mod/src/language_gui.py	2009-05-25 14:03:08.000000000 +0530
@@ -201,7 +201,7 @@ class childWindow:
             except RepoErrors:
                     str = _("The Network or the Repos of Yum has some problems, do you want to continue?\n'Yes' will change the language but not install it.\n'No' will exit without changing the language.")                
                                
-                    d = gtk.MessageDialog(None, gtk.DIALOG_MODAL,
+                    d = gtk.MessageDialog(self.mainWindow, gtk.DIALOG_MODAL,
                                       gtk.MESSAGE_QUESTION,
                                       message_format = str)
                                   
@@ -217,12 +217,12 @@ class childWindow:
                         return -1               
                                        
             if not is_RepoError:   
-                if not install.is_group_installed(grpid):
+                if not install.is_group_installed(grpid, self.mainWindow):
                     str = _(" language support is not installed, do you want to install it?")                
                     str = grpid[:-8] + str
                     str = str.capitalize()
             
-                    d = gtk.MessageDialog(None, gtk.DIALOG_MODAL,
+                    d = gtk.MessageDialog(self.mainWindow, gtk.DIALOG_MODAL,
                                       gtk.MESSAGE_QUESTION,
                                       message_format = str)
                                   
@@ -251,11 +251,9 @@ class childWindow:
             self.firstboot.changeLocale(defaultLang, fullName)
         else:
             #Else, we're not in firstboot mode, so show the dialog
-            dlg = gtk.MessageDialog(None, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
+            dlg = gtk.MessageDialog(self.mainWindow, 0, gtk.MESSAGE_INFO, gtk.BUTTONS_OK,
                                     _("The changes will take effect the next time you log in."))
-            dlg.set_position (gtk.WIN_POS_CENTER)
-            dlg.set_icon(iconPixbuf)
-            dlg.set_border_width(2)
+            dlg.set_border_width(6)
             dlg.set_modal(True)
             rc = dlg.run()
             dlg.destroy()


Index: system-config-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-language/devel/system-config-language.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- system-config-language.spec	26 Feb 2009 05:09:15 -0000	1.49
+++ system-config-language.spec	25 May 2009 09:14:21 -0000	1.50
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying the system language
 Name: system-config-language
 Version: 1.3.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/language
 License: GPLv2+
 Group: System Environment/Base
@@ -20,6 +20,7 @@ Requires: yum >= 2.9.5
 Requires: gtk2 >= 2.6
 Obsoletes: locale_config  <= %{version}
 Patch1: ca-po-462914.patch
+Patch2: dialogue-center-493824.patch
 
 %description
 system-config-language is a graphical user interface that 
@@ -28,6 +29,7 @@ allows the user to change the default la
 %prep
 %setup -q
 %patch1 -p1 -b .1-ca-po
+%patch2 -p1 -b .2-dialogue-center
 
 %build
 make %{?_smp_mflags}
@@ -85,6 +87,9 @@ fi
 %config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language
 
 %changelog
+* Mon May 25 2009 Pravin Satpute <psatpute at redhat.com>- 1.3.2-6
+- fix bug 493824
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the scm-commits mailing list