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

Accepting request 87040 from home:vuntz:branches:GNOME:Factory

Browse Source 
Fix crash in old greeter + rebase patch

OBS-URL: https://build.opensuse.org/request/show/87040
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=189
This commit is contained in:
Vincent Untz 2011-10-07 12:10:57 +00:00 committed by Git OBS Bridge
parent 65b2851713
commit 2cdf8d190d
4 changed files with 282 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gdm-fix-no-split-again.patch Normal file
View File

@ -0,0 +1,23 @@
commit ea366b1a582bbd886ec7da5d9f59b415d074164f
Author: Vincent Untz <vuntz@gnome.org>
Date: Fri Oct 7 13:07:43 2011 +0200
daemon: additional fix for legacy auth compatibility layer
g_str_has_prefix() was misused.
https://bugzilla.gnome.org/show_bug.cgi?id=658451
diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
index 535fdbf..d5a5bcd 100644
--- a/daemon/gdm-greeter-server.c
+++ b/daemon/gdm-greeter-server.c
@@ -270,7 +270,7 @@ translate_incoming_service_name (GdmGreeterServer *greeter_server,
g_debug ("GdmGreeterServer: Adjusting pam service from '%s' to 'gdm' for legacy compatibility", service_name);
service_name = "gdm";
greeter_server->priv->using_legacy_service_name = TRUE;
- } else if (g_str_has_prefix (service_name, "gdm-") == 0 && strcmp (service_name, "gdm-autologin") != 0) {
+ } else if (g_str_has_prefix (service_name, "gdm-") && strcmp (service_name, "gdm-autologin") != 0) {
g_debug ("GdmGreeterServer: Rejecting pam service '%s' for legacy compatibility", service_name);
return NULL;
}

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

@ -1,9 +1,9 @@
Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.c Index: gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.c
=================================================================== ===================================================================
--- gdm-2.31.2.orig/gui/simple-greeter/gdm-greeter-login-window.c --- gdm-3.2.0.orig/gui/simple-greeter/gdm-greeter-login-window.c
+++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.c +++ gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.c
@@ -1044,35 +1044,6 @@ on_user_unchosen (GdmUserChooserWidget @@ -1637,35 +1637,6 @@ gdm_greeter_login_window_set_default_ses
do_cancel (login_window); session_name);
} }
-static void -static void
@ -38,7 +38,7 @@ Index: gdm-2.31.2/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)
{ {
@@ -1184,16 +1155,19 @@ create_computer_info (GdmGreeterLoginWin @@ -1787,16 +1758,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,27 +60,30 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.c
} }
gdm_profile_end (NULL); gdm_profile_end (NULL);
@@ -1293,9 +1267,6 @@ load_theme (GdmGreeterLoginWindow *login @@ -1943,9 +1917,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);
- -
if (login_window->priv->user_list_disabled) { clear_active_extension (login_window);
switch_mode (login_window, MODE_AUTHENTICATION); switch_mode (login_window, MODE_SELECTION);
} else {
Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui Index: gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.ui
=================================================================== ===================================================================
--- gdm-2.31.2.orig/gui/simple-greeter/gdm-greeter-login-window.ui --- gdm-3.2.0.orig/gui/simple-greeter/gdm-greeter-login-window.ui
+++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui +++ gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.ui
@@ -2,28 +2,29 @@ @@ -1,29 +1,33 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<requires lib="gtk+" version="2.16"/> <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual --> - <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkFrame" id="window-frame"> - <object class="GtkFrame" id="window-frame">
+ <object class="GtkFrame" id="window-frame"> + <object class="GtkFrame" id="window-frame">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property> + <property name="label_xalign">0</property>
+ <property name="shadow_type">out</property> + <property name="shadow_type">out</property>
+ <child> + <child>
@ -88,19 +91,21 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
<property name="visible">True</property> <property name="visible">True</property>
- <property name="label_xalign">0</property> - <property name="label_xalign">0</property>
- <property name="shadow_type">out</property> - <property name="shadow_type">out</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">24</property> + <property name="border_width">24</property>
<child> <child>
- <object class="GtkAlignment" id="alignment2"> - <object class="GtkAlignment" id="alignment2">
+ <object class="GtkVBox" id="window-box"> + <object class="GtkVBox" id="window-box">
<property name="visible">True</property> <property name="visible">True</property>
- <property name="border_width">24</property> - <property name="border_width">24</property>
+ <property name="orientation">vertical</property> + <property name="can_focus">False</property>
+ <property name="spacing">10</property> + <property name="spacing">10</property>
<child> <child>
- <object class="GtkVBox" id="window-box"> - <object class="GtkVBox" id="window-box">
+ <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1">
<property name="visible">True</property> <property name="visible">True</property>
- <property name="spacing">10</property> - <property name="spacing">10</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property> + <property name="spacing">12</property>
<child> <child>
- <object class="GtkAlignment" id="alignment1"> - <object class="GtkAlignment" id="alignment1">
@ -109,49 +114,31 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
- <child> - <child>
- <object class="GtkImage" id="logo-image"> - <object class="GtkImage" id="logo-image">
- <property name="visible">True</property> - <property name="visible">True</property>
- <property name="pixel_size">64</property> - <property name="pixel_size">48</property>
- <property name="icon_name">computer</property> - <property name="icon_name">computer</property>
- </object> - </object>
- </child> - </child>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property> + <property name="yalign">0</property>
+ <property name="pixel_size">48</property> + <property name="pixel_size">48</property>
+ <property name="icon_name">computer</property> + <property name="icon_name">computer</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -32,227 +33,103 @@ @@ -32,220 +36,111 @@
</packing> </packing>
</child> </child>
<child> <child>
- <object class="GtkEventBox" id="computer-info-event-box"> - <object class="GtkEventBox" id="computer-info-event-box">
+ <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1">
<property name="visible">True</property> <property name="visible">True</property>
- <property name="visible_window">False</property> - <property name="visible_window">False</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property> + <property name="orientation">vertical</property>
+ <property name="spacing">6</property> + <property name="spacing">6</property>
<child> <child>
- <object class="GtkNotebook" id="computer-info-notebook"> - <object class="GtkNotebook" id="computer-info-notebook">
+ <object class="GtkLabel" id="computer-info-version-label"> + <object class="GtkLabel" id="computer-info-version-label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Version</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="computer-info-name-label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Computer Name</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
<property name="visible">True</property> <property name="visible">True</property>
- <property name="show_tabs">False</property> - <property name="show_tabs">False</property>
- <property name="show_border">False</property> - <property name="show_border">False</property>
@ -236,6 +223,33 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
- <property name="tab_fill">False</property> - <property name="tab_fill">False</property>
- </packing> - </packing>
- </child> - </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Version</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="computer-info-name-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Computer Name</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child> <child>
- <placeholder/> - <placeholder/>
- </child> - </child>
@ -243,6 +257,7 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
- <object class="GtkLabel" id="label16"> - <object class="GtkLabel" id="label16">
+ <object class="GtkLabel" id="auth-banner-label"> + <object class="GtkLabel" id="auth-banner-label">
<property name="visible">True</property> <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="justify">center</property> + <property name="justify">center</property>
+ <property name="wrap">True</property> + <property name="wrap">True</property>
</object> </object>
@ -262,11 +277,15 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
<packing> <packing>
- <property name="expand">False</property> - <property name="expand">False</property>
- <property name="fill">False</property> - <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property> + <property name="position">0</property>
+ </packing> + </packing>
+ </child> + </child>
@ -287,32 +306,22 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
- <object class="GtkAlignment" id="alignment3"> - <object class="GtkAlignment" id="alignment3">
+ <object class="GtkVBox" id="selection-box"> + <object class="GtkVBox" id="selection-box">
<property name="visible">True</property> <property name="visible">True</property>
+ <property name="orientation">vertical</property> + <property name="spacing">2</property>
+ <property name="spacing">10</property>
+ <child>
+ <placeholder/>
+ </child>
<child> <child>
- <object class="GtkVBox" id="selection-box"> - <object class="GtkVBox" id="selection-box">
+ <object class="GtkHBox" id="auth-input-box"> + <object class="GtkAlignment" id="task-list-alignment">
<property name="visible">True</property> <property name="visible">True</property>
- <property name="spacing">10</property> - <property name="spacing">2</property>
+ <property name="spacing">6</property>
<child>
- <placeholder/>
- </child>
- <child> - <child>
- <object class="GtkHBox" id="auth-input-box"> - <object class="GtkAlignment" id="task-list-alignment">
+ <object class="GtkLabel" id="auth-prompt-label">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="auth-prompt-label">
- <property name="visible">True</property> - <property name="visible">True</property>
- - <property name="xalign">1.0</property>
- <accessibility> - <property name="xscale">0.0</property>
- <relation type="label-for" target="auth-prompt-entry"/> - <child>
- </accessibility> - <object class="GdmExtensionList" id="extension-list">
- <property name="visible">False</property>
- </object>
- </child>
- </object> - </object>
- <packing> - <packing>
- <property name="expand">False</property> - <property name="expand">False</property>
@ -320,62 +329,34 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
- <property name="position">0</property> - <property name="position">0</property>
- </packing> - </packing>
- </child> - </child>
- <child> + <property name="xalign">1.0</property>
- <object class="GtkEntry" id="auth-prompt-entry"> + <property name="xscale">0.0</property>
- <property name="visible">True</property> <child>
- <property name="can_focus">True</property> - <object class="GdmUserChooserWidget" id="user-chooser">
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <object class="GdmExtensionList" id="extension-list">
- <property name="activates_default">True</property> <property name="visible">False</property>
- <accessibility> </object>
- <relation type="labelled-by" target="auth-prompt-label"/>
- </accessibility>
- </object>
- <packing> - <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property> - <property name="position">1</property>
- </packing> - </packing>
- </child> - </child>
- <child> - <child>
- <object class="GtkHBox" id="auth-page-box">
- <property name="visible">True</property>
- <property name="border_width">10</property>
- <child>
- <placeholder/> - <placeholder/>
- </child> - </child>
+ <accessibility>
+ <relation type="label-for" target="auth-prompt-entry"/>
+ </accessibility>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="auth-message-box">
+ <object class="GtkEntry" id="auth-prompt-entry">
<property name="visible">True</property>
- <child>
- <object class="GtkLabel" id="auth-message-label">
- <property name="visible">True</property>
- </object> - </object>
- <packing> - <packing>
- <property name="position">0</property>
- </packing>
- </child>
+ <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="invisible_char">&#x25CF;</property>
+ <property name="activates_default">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="auth-prompt-label"/>
+ </accessibility>
</object>
<packing>
- <property name="expand">False</property> - <property name="expand">False</property>
- <property name="fill">False</property> - <property name="fill">False</property>
- <property name="position">2</property> - <property name="position">2</property>
+ <property name="position">1</property> - </packing>
</packing>
</child> </child>
- </object> </object>
- </child> - </child>
- </object> - </object>
- <packing> - <packing>
@ -388,81 +369,115 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
- <property name="spacing">6</property> - <property name="spacing">6</property>
- <property name="layout_style">end</property> - <property name="layout_style">end</property>
- <child> - <child>
- <object class="GdmSessionOptionWidget" id="session-option-widget">
- <property name="visible">False</property>
- <property name="xscale">0.0</property>
- <property name="yscale">0.0</property>
- <property name="xalign">0.0</property>
- <property name="yalign">1.0</property>
- </object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">0</property>
- <property name="secondary">True</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="cancel-button"> - <object class="GtkButton" id="cancel-button">
- <property name="label">Cancel</property> - <property name="label" translatable="yes">Cancel</property>
- <property name="visible">True</property> - <property name="visible">True</property>
- <property name="can_focus">True</property> - <property name="can_focus">True</property>
- </object> + <object class="GdmUserChooserWidget" id="user-chooser">
- <packing> + <property name="visible">False</property>
</object>
<packing>
- <property name="expand">False</property> - <property name="expand">False</property>
- <property name="fill">False</property> - <property name="fill">False</property>
- <property name="position">0</property> + <property name="expand">True</property>
- </packing> + <property name="fill">True</property>
- </child> <property name="position">1</property>
- <child> </packing>
</child>
<child>
- <object class="GtkButton" id="unlock-button"> - <object class="GtkButton" id="unlock-button">
- <property name="label" translatable="yes">Unlock</property> - <property name="label" translatable="yes">Unlock</property>
- <property name="visible">True</property> + <object class="GtkHBox" id="auth-page-box">
<property name="visible">True</property>
- <property name="can_focus">True</property> - <property name="can_focus">True</property>
- <property name="can_default">True</property> - <property name="can_default">True</property>
- <property name="receives_default">True</property> - <property name="receives_default">True</property>
+ <property name="border_width">10</property>
+ <child> + <child>
+ <placeholder/> + <placeholder/>
+ </child> + </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
@@ -261,31 +138,88 @@ @@ -253,32 +148,92 @@
<property name="position">2</property>
</packing> </packing>
</child> </child>
<child> - <child>
- <object class="GtkButton" id="log-in-button"> - <object class="GtkButton" id="log-in-button">
- <property name="label" translatable="yes">Login</property> - <property name="label" translatable="yes">Login</property>
+ <object class="GtkHBox" id="auth-message-box"> - <property name="visible">True</property>
<property name="visible">True</property>
- <property name="can_focus">True</property> - <property name="can_focus">True</property>
- <property name="can_default">True</property> - <property name="can_default">True</property>
- <property name="has_default">True</property> - <property name="has_default">True</property>
- <property name="receives_default">False</property> - <property name="receives_default">False</property>
+ <child> - </object>
+ <object class="GtkLabel" id="auth-message-label"> - <packing>
+ <property name="visible">True</property> - <property name="expand">False</property>
+ </object> - <property name="fill">False</property>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">5</property> - <property name="position">5</property>
+ <property name="position">2</property> - </packing>
</packing> - </child>
</child> + </object>
</object>
+ </child> + </child>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="position">1</property> + <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
+ <object class="GtkHButtonBox" id="buttonbox"> + <object class="GtkHButtonBox" id="buttonbox">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property> + <property name="spacing">6</property>
+ <property name="layout_style">end</property> + <property name="layout_style">end</property>
+ <child> + <child>
+ <object class="GdmSessionOptionWidget" id="session-option-widget">
+ <property name="visible">False</property>
+ <property name="xscale">0.0</property>
+ <property name="yscale">0.0</property>
+ <property name="xalign">0.0</property>
+ <property name="yalign">1.0</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel-button"> + <object class="GtkButton" id="cancel-button">
+ <property name="label">gtk-cancel</property> + <property name="label" translatable="yes">Cancel</property>
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">True</property> + <property name="can_focus">True</property>
+ <property name="use_stock">True</property> + <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">False</property>
+ <property name="fill">False</property> + <property name="fill">False</property>
+ <property name="position">0</property> + <property name="position">1</property>
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
@ -472,13 +487,14 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
+ <property name="can_focus">True</property> + <property name="can_focus">True</property>
+ <property name="can_default">True</property> + <property name="can_default">True</property>
+ <property name="receives_default">True</property> + <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">False</property>
+ <property name="fill">False</property> + <property name="fill">False</property>
+ <property name="position">1</property> <property name="position">2</property>
+ </packing> </packing>
+ </child> </child>
+ <child> + <child>
+ <object class="GtkButton" id="log-in-button"> + <object class="GtkButton" id="log-in-button">
+ <property name="label" translatable="yes">Login</property> + <property name="label" translatable="yes">Login</property>
@ -487,19 +503,18 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
+ <property name="can_default">True</property> + <property name="can_default">True</property>
+ <property name="has_default">True</property> + <property name="has_default">True</property>
+ <property name="receives_default">False</property> + <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ </object> + </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">False</property>
+ <property name="fill">False</property> + <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property> + <property name="pack_type">end</property>
+ <property name="position">2</property> + <property name="position">2</property>
+ </packing> + </packing>
@ -510,35 +525,38 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
+ </child> + </child>
+ </object> + </object>
</interface> </interface>
Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new Index: gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.ui.new
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new +++ gdm-3.2.0/gui/simple-greeter/gdm-greeter-login-window.ui.new
@@ -0,0 +1,225 @@ @@ -0,0 +1,239 @@
+<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?>
+<interface> +<interface>
+ <requires lib="gtk+" version="2.16"/> + <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkFrame" id="window-frame"> + <object class="GtkFrame" id="window-frame">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property> + <property name="label_xalign">0</property>
+ <property name="shadow_type">out</property> + <property name="shadow_type">out</property>
+ <child> + <child>
+ <object class="GtkAlignment" id="alignment2"> + <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">24</property> + <property name="border_width">24</property>
+ <child> + <child>
+ <object class="GtkVBox" id="window-box"> + <object class="GtkVBox" id="window-box">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="orientation">vertical</property> + <property name="can_focus">False</property>
+ <property name="spacing">10</property> + <property name="spacing">10</property>
+ <child> + <child>
+ <object class="GtkHBox" id="hbox1"> + <object class="GtkBox" id="hbox1">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property> + <property name="spacing">12</property>
+ <child> + <child>
+ <object class="GtkImage" id="logo-image"> + <object class="GtkImage" id="logo-image">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="yalign">0</property> + <property name="yalign">0</property>
+ <property name="pixel_size">48</property> + <property name="pixel_size">48</property>
+ <property name="icon_name">computer</property> + <property name="icon_name">computer</property>
@ -550,36 +568,45 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
+ <object class="GtkVBox" id="vbox1"> + <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property> + <property name="orientation">vertical</property>
+ <property name="spacing">6</property> + <property name="spacing">6</property>
+ <child> + <child>
+ <object class="GtkLabel" id="computer-info-version-label"> + <object class="GtkLabel" id="computer-info-version-label">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property> + <property name="xalign">0</property>
+ <property name="label" translatable="yes">Version</property> + <property name="label" translatable="yes">Version</property>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property> + <property name="position">0</property>
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
+ <object class="GtkLabel" id="computer-info-name-label"> + <object class="GtkLabel" id="computer-info-name-label">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property> + <property name="xalign">0</property>
+ <property name="label" translatable="yes">Computer Name</property> + <property name="label" translatable="yes">Computer Name</property>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property> + <property name="position">1</property>
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
+ <object class="GtkAlignment" id="alignment1"> + <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child> + <child>
+ <object class="GtkLabel" id="auth-banner-label"> + <object class="GtkLabel" id="auth-banner-label">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="justify">center</property> + <property name="justify">center</property>
+ <property name="wrap">True</property> + <property name="wrap">True</property>
+ </object> + </object>
@ -593,11 +620,15 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ </child> + </child>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property> + <property name="position">1</property>
+ </packing> + </packing>
+ </child> + </child>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property> + <property name="position">0</property>
+ </packing> + </packing>
+ </child> + </child>
@ -607,21 +638,17 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ <child> + <child>
+ <object class="GtkVBox" id="selection-box"> + <object class="GtkVBox" id="selection-box">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="orientation">vertical</property> + <property name="spacing">2</property>
+ <property name="spacing">10</property>
+ <child> + <child>
+ <placeholder/> + <object class="GtkAlignment" id="task-list-alignment">
+ <property name="visible">True</property>
+ <property name="xalign">1.0</property>
+ <property name="xscale">0.0</property>
+ <child>
+ <object class="GdmExtensionList" id="extension-list">
+ <property name="visible">False</property>
+ </object>
+ </child> + </child>
+ <child>
+ <object class="GtkHBox" id="auth-input-box">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="auth-prompt-label">
+ <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>
@ -630,45 +657,26 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
+ <object class="GtkEntry" id="auth-prompt-entry"> + <object class="GdmUserChooserWidget" id="user-chooser">
+ <property name="visible">True</property> + <property name="visible">False</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="invisible_char">&#x25CF;</property>
+ <property name="activates_default">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="auth-prompt-label"/>
+ </accessibility>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property> + <property name="position">1</property>
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
+ <object class="GtkHBox" id="auth-page-box">
+ <property name="visible">True</property>
+ <property name="border_width">10</property>
+ <child>
+ <placeholder/> + <placeholder/>
+ </child> + </child>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">False</property>
+ <property name="fill">False</property> + <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="auth-message-box">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="auth-message-label">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property> + <property name="position">2</property>
+ </packing> + </packing>
+ </child> + </child>
@ -676,25 +684,44 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ </child> + </child>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="position">1</property> + <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
+ <object class="GtkHButtonBox" id="buttonbox"> + <object class="GtkHButtonBox" id="buttonbox">
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property> + <property name="spacing">6</property>
+ <property name="layout_style">end</property> + <property name="layout_style">end</property>
+ <child> + <child>
+ <object class="GdmSessionOptionWidget" id="session-option-widget">
+ <property name="visible">False</property>
+ <property name="xscale">0.0</property>
+ <property name="yscale">0.0</property>
+ <property name="xalign">0.0</property>
+ <property name="yalign">1.0</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel-button"> + <object class="GtkButton" id="cancel-button">
+ <property name="label">gtk-cancel</property> + <property name="label" translatable="yes">Cancel</property>
+ <property name="visible">True</property> + <property name="visible">True</property>
+ <property name="can_focus">True</property> + <property name="can_focus">True</property>
+ <property name="use_stock">True</property> + <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">False</property>
+ <property name="fill">False</property> + <property name="fill">False</property>
+ <property name="position">0</property> + <property name="position">1</property>
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
@ -704,11 +731,12 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ <property name="can_focus">True</property> + <property name="can_focus">True</property>
+ <property name="can_default">True</property> + <property name="can_default">True</property>
+ <property name="receives_default">True</property> + <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">False</property>
+ <property name="fill">False</property> + <property name="fill">False</property>
+ <property name="position">1</property> + <property name="position">2</property>
+ </packing> + </packing>
+ </child> + </child>
+ <child> + <child>
@ -719,6 +747,7 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ <property name="can_default">True</property> + <property name="can_default">True</property>
+ <property name="has_default">True</property> + <property name="has_default">True</property>
+ <property name="receives_default">False</property> + <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">False</property>
@ -728,8 +757,8 @@ Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
+ </child> + </child>
+ </object> + </object>
+ <packing> + <packing>
+ <property name="expand">False</property> + <property name="expand">True</property>
+ <property name="fill">False</property> + <property name="fill">True</property>
+ <property name="pack_type">end</property> + <property name="pack_type">end</property>
+ <property name="position">2</property> + <property name="position">2</property>
+ </packing> + </packing>

7
gdm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Oct 7 11:15:20 UTC 2011 - vuntz@opensuse.org
- Add gdm-fix-no-split-again.patch: do not crash in old
(non-gnome-shell) greeter when trying to login.
- Rebase gdm-greeter-greater-ui.patch, fix bnc#689552.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 1 05:39:11 UTC 2011 - coolo@suse.com Sat Oct 1 05:39:11 UTC 2011 - coolo@suse.com

9
gdm.spec
View File

@ -55,7 +55,7 @@ Patch8: gdm-sysconfig-settings.patch
Patch9: gdm-passwordless-login.patch Patch9: gdm-passwordless-login.patch
# PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH_FEATURE-SLED bnc#627575) # PATCH-NEEDS-REBASE gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain (was: PATCH_FEATURE-SLED bnc#627575)
Patch10: gdm-domain-logon.patch Patch10: gdm-domain-logon.patch
# PATCH-NEEDS-REBASE 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
@ -71,6 +71,8 @@ Patch40: gdm-look-at-runlevel.patch
Patch60: gdm-selinux.patch Patch60: gdm-selinux.patch
# PATCH-FIX-OPENSUSE gdm-unified-auth.patch bgo#658451 vuntz@opensuse.org -- Fix "better unified authentication compatibility" # PATCH-FIX-OPENSUSE gdm-unified-auth.patch bgo#658451 vuntz@opensuse.org -- Fix "better unified authentication compatibility"
Patch61: gdm-unified-auth.patch Patch61: gdm-unified-auth.patch
# PATCH-FIX-OPENSUSE gdm-fix-no-split-again.patch bgo#658451 vuntz@opensuse.org -- Fix in addition to previous patch, to prevent crash in old greeter when trying to login
Patch62: gdm-fix-no-split-again.patch
BuildRequires: check-devel BuildRequires: check-devel
BuildRequires: dbus-1-glib-devel BuildRequires: dbus-1-glib-devel
# needed for directory ownership # needed for directory ownership
@ -218,7 +220,7 @@ running display manager.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
#disabled, needed for patch15 #disabled, needed for patch10
#gnome-patch-translation-prepare #gnome-patch-translation-prepare
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
@ -231,7 +233,7 @@ translation-update-upstream
%patch9 -p1 %patch9 -p1
#%%patch10 -p1 #%%patch10 -p1
# needs rebase (bnc#689552) # needs rebase (bnc#689552)
#%%patch15 -p1 %patch15 -p1
%patch18 -p1 %patch18 -p1
%patch31 -p1 %patch31 -p1
%patch34 -p1 %patch34 -p1
@ -239,6 +241,7 @@ translation-update-upstream
%patch40 -p1 %patch40 -p1
%patch60 %patch60
%patch61 -p1 %patch61 -p1
%patch62 -p1
#gnome-patch-translation-update #gnome-patch-translation-update
%build %build