rpms/gdm/F-9 gdm-2.22.0-fix-language-selector.patch, NONE, 1.1 gdm.spec, 1.385, 1.386

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30743

Modified Files:
	gdm.spec 
Added Files:
	gdm-2.22.0-fix-language-selector.patch 
Log Message:
- Patch from Matthias to fix language selector (bug 445631)


gdm-2.22.0-fix-language-selector.patch:

--- NEW FILE gdm-2.22.0-fix-language-selector.patch ---
diff -up gdm-2.22.0/gui/simple-greeter/gdm-option-widget.c.hidden-langs gdm-2.22.0/gui/simple-greeter/gdm-option-widget.c
--- gdm-2.22.0/gui/simple-greeter/gdm-option-widget.c.hidden-langs      2008-05-09 23:42:37.000000000 -0400
+++ gdm-2.22.0/gui/simple-greeter/gdm-option-widget.c   2008-05-09 23:43:28.000000000 -0400
@@ -617,13 +617,9 @@ path_is_separator (GdmOptionWidget *widg
 static gboolean
 gdm_option_widget_check_visibility (GdmOptionWidget *widget)
 {
-        int number_of_rows;
-
-        number_of_rows = widget->priv->number_of_top_rows +
-                         widget->priv->number_of_middle_rows +
-                         widget->priv->number_of_bottom_rows;
-
-        if (number_of_rows > 1) {
+        if (widget->priv->number_of_top_rows > 0 ||
+            widget->priv->number_of_middle_rows > 1 || 
+            widget->priv->number_of_bottom_rows > 0) {
                 gtk_widget_show (widget->priv->items_combo_box);
                 gtk_widget_show (widget->priv->label);



Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-9/gdm.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -r1.385 -r1.386
--- gdm.spec	9 May 2008 16:44:45 -0000	1.385
+++ gdm.spec	10 May 2008 04:06:26 -0000	1.386
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.22.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -79,6 +79,8 @@
 Patch2: gdm-silence-debugging.patch
 # Fix Chinese date/time display (fixed in upstream svn)
 Patch3: zh.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=445631
+Patch4: gdm-2.22.0-fix-language-selector.patch
 Patch99: gdm-2.21.8-fedora-logo.patch
 
 %package user-switch-applet
@@ -101,6 +103,7 @@
 %patch1 -p1 -b .xkb-groups
 %patch2 -p1 -b .silence-debugging
 %patch3 -p1 -b .chinese-time
+%patch4 -p1 -b .fix-language-selector
 %patch99 -p1 -b .fedora-logo
 
 %build
@@ -298,6 +301,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Sat May 10 2008 Ray Strode <rstrode at redhat.com> - 1:2.22.0-4
+- Patch from Matthias to fix language selector (bug 445631)
+
 * Fri May  9 2008 Matthias Clasen <mclasen at redhat.com> - 1:2.22.0-3
 - Fix Chinese date/time display (#445664)