rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Accepting request 41710 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/gdm based on submit request 41710 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/41710
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=95
This commit is contained in:
OBS User autobuild 2010-06-21 16:15:26 +00:00 committed by Git OBS Bridge
commit 9ec245cf0f
3 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gdm-greeter-greater-ui.patch
View File

@ -1,8 +1,8 @@
Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.c Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
=================================================================== ===================================================================
--- gdm-2.29.5.orig/gui/simple-greeter/gdm-greeter-login-window.c --- gdm-2.30.2.orig/gui/simple-greeter/gdm-greeter-login-window.c
+++ gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.c +++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
@@ -884,35 +884,6 @@ on_user_unchosen (GdmUserChooserWidget @@ -950,35 +950,6 @@ on_user_unchosen (GdmUserChooserWidget
do_cancel (login_window); do_cancel (login_window);
} }
@ -38,7 +38,7 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.c
static char * static char *
file_read_one_line (const char *filename) file_read_one_line (const char *filename)
{ {
@@ -1011,16 +982,19 @@ create_computer_info (GdmGreeterLoginWin @@ -1077,16 +1048,19 @@ create_computer_info (GdmGreeterLoginWin
if (strcmp (localhost, "localhost") == 0 || if (strcmp (localhost, "localhost") == 0 ||
strcmp (localhost, "localhost.localdomain") == 0) { strcmp (localhost, "localhost.localdomain") == 0) {
@ -60,20 +60,20 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.c
} }
gdm_profile_end (NULL); gdm_profile_end (NULL);
@@ -1122,9 +1096,6 @@ load_theme (GdmGreeterLoginWindow *login @@ -1190,9 +1164,6 @@ load_theme (GdmGreeterLoginWindow *login
create_computer_info (login_window); create_computer_info (login_window);
- box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-event-box")); - box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-event-box"));
- g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window); - g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window);
- -
switch_mode (login_window, MODE_SELECTION); if (login_window->priv->user_list_disabled) {
switch_mode (login_window, MODE_AUTHENTICATION);
gdm_profile_end (NULL); } else {
Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
=================================================================== ===================================================================
--- gdm-2.29.5.orig/gui/simple-greeter/gdm-greeter-login-window.ui --- gdm-2.30.2.orig/gui/simple-greeter/gdm-greeter-login-window.ui
+++ gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui +++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
@@ -2,28 +2,29 @@ @@ -2,28 +2,29 @@
<interface> <interface>
<requires lib="gtk+" version="2.16"/> <requires lib="gtk+" version="2.16"/>
@ -119,7 +119,7 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -32,264 +33,197 @@ @@ -32,271 +33,203 @@
</packing> </packing>
</child> </child>
<child> <child>
@ -242,6 +242,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
- <object class="GtkLabel" id="label13"> - <object class="GtkLabel" id="label13">
+ <object class="GtkLabel" id="auth-prompt-label"> + <object class="GtkLabel" id="auth-prompt-label">
<property name="visible">True</property> <property name="visible">True</property>
+ <accessibility>
+ <relation type="label-for" target="auth-prompt-entry"/>
+ </accessibility>
</object> </object>
<packing> <packing>
- <property name="position">3</property> - <property name="position">3</property>
@ -262,6 +265,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="invisible_char">&#x25CF;</property> + <property name="invisible_char">&#x25CF;</property>
+ <property name="activates_default">True</property> + <property name="activates_default">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="auth-prompt-label"/>
+ </accessibility>
</object> </object>
<packing> <packing>
- <property name="position">4</property> - <property name="position">4</property>
@ -371,6 +377,10 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
- <child> - <child>
- <object class="GtkLabel" id="auth-prompt-label"> - <object class="GtkLabel" id="auth-prompt-label">
- <property name="visible">True</property> - <property name="visible">True</property>
-
- <accessibility>
- <relation type="label-for" target="auth-prompt-entry"/>
- </accessibility>
- </object> - </object>
- <packing> - <packing>
- <property name="expand">False</property> - <property name="expand">False</property>
@ -384,6 +394,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
- <property name="can_focus">True</property> - <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="activates_default">True</property> - <property name="activates_default">True</property>
- <accessibility>
- <relation type="labelled-by" target="auth-prompt-label"/>
- </accessibility>
- </object> - </object>
- <packing> - <packing>
- <property name="position">1</property> - <property name="position">1</property>
@ -510,11 +523,11 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui
+ </child> + </child>
+ </object> + </object>
</interface> </interface>
Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui.new Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui.new +++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
@@ -0,0 +1,229 @@ @@ -0,0 +1,235 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+<interface> +<interface>
+ <requires lib="gtk+" version="2.16"/> + <requires lib="gtk+" version="2.16"/>
@ -619,6 +632,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ <child> + <child>
+ <object class="GtkLabel" id="auth-prompt-label"> + <object class="GtkLabel" id="auth-prompt-label">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <accessibility>
+ <relation type="label-for" target="auth-prompt-entry"/>
+ </accessibility>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">False</property>
@ -633,6 +649,9 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="invisible_char">&#x25CF;</property> + <property name="invisible_char">&#x25CF;</property>
+ <property name="activates_default">True</property> + <property name="activates_default">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="auth-prompt-label"/>
+ </accessibility>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="position">1</property> + <property name="position">1</property>

6
gdm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 17 14:41:01 CEST 2010 - vuntz@opensuse.org
- Update gdm-greeter-greater-ui.patch: we didn't rebase it earlier,
and lost our improved UI.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 24 15:55:31 UTC 2010 - guido+opensuse.org@berhoerster.name Mon May 24 15:55:31 UTC 2010 - guido+opensuse.org@berhoerster.name

7
gdm.spec
View File

@ -42,7 +42,7 @@ BuildRequires: zenity
License: GPLv2+ License: GPLv2+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.30.2 Version: 2.30.2
Release: 2 Release: 3
Summary: The GNOME 2.x Display Manager Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd Source1: gdm.pamd
@ -63,7 +63,7 @@ Patch7: gdm-suse-xsession.patch
Patch8: gdm-sysconfig-settings.patch Patch8: gdm-sysconfig-settings.patch
# PATCH-FEATURE-SLED gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain # PATCH-FEATURE-SLED gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain
Patch9: gdm-domain-logon.patch Patch9: gdm-domain-logon.patch
# PATCH-NEEDS-REBASE (was PATCH-FIX-UPSTREAM) gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) # PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch)
Patch15: gdm-greeter-greater-ui.patch Patch15: gdm-greeter-greater-ui.patch
# PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations.
Patch18: gdm-always-reflect-keyboard-layout.patch Patch18: gdm-always-reflect-keyboard-layout.patch
@ -152,8 +152,7 @@ gnome-patch-translation-prepare
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
#FIXME - Needs rebase %patch15 -p1
#%patch15 -p1
%patch18 -p1 %patch18 -p1
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1