Accepting request 44873 from home:vuntz:branches:GNOME:Factory
Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 44873 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44873 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=135
This commit is contained in:
parent
9a89393a30
commit
a6ba424bba
@ -1,14 +0,0 @@
|
||||
diff --git a/data/locale.alias b/data/locale.alias
|
||||
new file mode 100644
|
||||
index 0000000..7cabea6
|
||||
--- a/dev/null
|
||||
+++ b/data/locale.alias
|
||||
@@ -0,0 +1,7 @@
|
||||
+# You could insert none UTF-8 locales likes C, ja_JP.eucJP
|
||||
+# The format is language label, space and locale name but
|
||||
+# the language label is no longer used.
|
||||
+#
|
||||
+# This file will be removed in the future once gdm setup tool is generated.
|
||||
+#
|
||||
+#Unspecified C,POSIX
|
||||
|
@ -1,7 +1,7 @@
|
||||
Index: gdm-2.31.2/daemon/gdm-session-direct.c
|
||||
Index: gdm-2.30.4/daemon/gdm-session-direct.c
|
||||
===================================================================
|
||||
--- gdm-2.31.2.orig/daemon/gdm-session-direct.c
|
||||
+++ gdm-2.31.2/daemon/gdm-session-direct.c
|
||||
--- gdm-2.30.4.orig/daemon/gdm-session-direct.c
|
||||
+++ gdm-2.30.4/daemon/gdm-session-direct.c
|
||||
@@ -50,6 +50,8 @@
|
||||
#include <dbus/dbus-glib.h>
|
||||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
@ -11,18 +11,17 @@ Index: gdm-2.31.2/daemon/gdm-session-direct.c
|
||||
#include "gdm-session-direct.h"
|
||||
#include "gdm-session.h"
|
||||
#include "gdm-session-private.h"
|
||||
@@ -674,6 +676,15 @@ get_fallback_session_name (GdmSessionDir
|
||||
@@ -662,6 +664,14 @@ get_fallback_session_name (GdmSessionDir
|
||||
}
|
||||
}
|
||||
|
||||
+ name = gdm_sysconfig_load_value ("/etc/sysconfig/windowmanager", "DEFAULT_WM");
|
||||
+ if (name && get_session_command_for_name (name, NULL)) {
|
||||
+ return name;
|
||||
+ }
|
||||
+
|
||||
+ if (name) {
|
||||
+ g_free (name);
|
||||
+ g_free (session_direct->priv->fallback_session_name);
|
||||
+ session_direct->priv->fallback_session_name = name;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ g_free (name);
|
||||
+
|
||||
name = g_strdup ("gnome");
|
||||
if (get_session_command_for_name (name, NULL)) {
|
||||
|
@ -1,8 +1,8 @@
|
||||
Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
===================================================================
|
||||
--- gdm-2.30.2.orig/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
+++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
@@ -950,35 +950,6 @@ on_user_unchosen (GdmUserChooserWidget
|
||||
--- gdm-2.31.2.orig/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
+++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
@@ -1044,35 +1044,6 @@ on_user_unchosen (GdmUserChooserWidget
|
||||
do_cancel (login_window);
|
||||
}
|
||||
|
||||
@ -38,7 +38,7 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
static char *
|
||||
file_read_one_line (const char *filename)
|
||||
{
|
||||
@@ -1077,16 +1048,19 @@ create_computer_info (GdmGreeterLoginWin
|
||||
@@ -1184,16 +1155,19 @@ create_computer_info (GdmGreeterLoginWin
|
||||
if (strcmp (localhost, "localhost") == 0 ||
|
||||
strcmp (localhost, "localhost.localdomain") == 0) {
|
||||
|
||||
@ -60,7 +60,7 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
}
|
||||
|
||||
gdm_profile_end (NULL);
|
||||
@@ -1190,9 +1164,6 @@ load_theme (GdmGreeterLoginWindow *login
|
||||
@@ -1293,9 +1267,6 @@ load_theme (GdmGreeterLoginWindow *login
|
||||
|
||||
create_computer_info (login_window);
|
||||
|
||||
@ -70,10 +70,10 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.c
|
||||
if (login_window->priv->user_list_disabled) {
|
||||
switch_mode (login_window, MODE_AUTHENTICATION);
|
||||
} else {
|
||||
Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
===================================================================
|
||||
--- gdm-2.30.2.orig/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
+++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
--- gdm-2.31.2.orig/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
+++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
@@ -2,28 +2,29 @@
|
||||
<interface>
|
||||
<requires lib="gtk+" version="2.16"/>
|
||||
@ -119,7 +119,7 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -32,271 +33,203 @@
|
||||
@@ -32,227 +33,103 @@
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
@ -188,96 +188,45 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
- <property name="tab_fill">False</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
<child>
|
||||
- <child>
|
||||
- <placeholder/>
|
||||
- </child>
|
||||
- <child type="tab">
|
||||
- <object class="GtkLabel" id="label12">
|
||||
+ <object class="GtkLabel" id="auth-banner-label">
|
||||
<property name="visible">True</property>
|
||||
+ <property name="justify">center</property>
|
||||
+ <property name="wrap">True</property>
|
||||
</object>
|
||||
- <property name="visible">True</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="position">2</property>
|
||||
- <property name="tab_fill">False</property>
|
||||
- </packing>
|
||||
</child>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">False</property>
|
||||
+ <property name="position">2</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="position">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="position">0</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkAlignment" id="alignment3">
|
||||
+ <property name="visible">True</property>
|
||||
+ <child>
|
||||
+ <object class="GtkVBox" id="selection-box">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="orientation">vertical</property>
|
||||
+ <property name="spacing">10</property>
|
||||
+ <child>
|
||||
+ <placeholder/>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkHBox" id="auth-input-box">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="spacing">6</property>
|
||||
<child>
|
||||
- </child>
|
||||
- <child>
|
||||
- <placeholder/>
|
||||
- </child>
|
||||
- <child type="tab">
|
||||
- <object class="GtkLabel" id="label13">
|
||||
+ <object class="GtkLabel" id="auth-prompt-label">
|
||||
<property name="visible">True</property>
|
||||
+ <accessibility>
|
||||
+ <relation type="label-for" target="auth-prompt-entry"/>
|
||||
+ </accessibility>
|
||||
</object>
|
||||
<packing>
|
||||
- <property name="visible">True</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="position">3</property>
|
||||
- <property name="tab_fill">False</property>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">False</property>
|
||||
+ <property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
- <placeholder/>
|
||||
- </child>
|
||||
- <child type="tab">
|
||||
- <object class="GtkLabel" id="label14">
|
||||
+ <object class="GtkEntry" id="auth-prompt-entry">
|
||||
<property name="visible">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="invisible_char">●</property>
|
||||
+ <property name="activates_default">True</property>
|
||||
+ <accessibility>
|
||||
+ <relation type="labelled-by" target="auth-prompt-label"/>
|
||||
+ </accessibility>
|
||||
</object>
|
||||
<packing>
|
||||
- <property name="visible">True</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="position">4</property>
|
||||
- <property name="tab_fill">False</property>
|
||||
+ <property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
- <placeholder/>
|
||||
- </child>
|
||||
- <child type="tab">
|
||||
- <object class="GtkLabel" id="label15">
|
||||
- <property name="visible">True</property>
|
||||
@ -287,29 +236,20 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
- <property name="tab_fill">False</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">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>
|
||||
- <placeholder/>
|
||||
- </child>
|
||||
- <child type="tab">
|
||||
- <object class="GtkLabel" id="label16">
|
||||
+ <object class="GtkLabel" id="auth-message-label">
|
||||
+ <object class="GtkLabel" id="auth-banner-label">
|
||||
<property name="visible">True</property>
|
||||
+ <property name="justify">center</property>
|
||||
+ <property name="wrap">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
- <packing>
|
||||
- <property name="position">6</property>
|
||||
- <property name="tab_fill">False</property>
|
||||
+ <property name="position">0</property>
|
||||
</packing>
|
||||
- </packing>
|
||||
</child>
|
||||
</object>
|
||||
+ <packing>
|
||||
@ -319,59 +259,51 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
+ </packing>
|
||||
</child>
|
||||
</object>
|
||||
- <packing>
|
||||
<packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">False</property>
|
||||
- <property name="position">1</property>
|
||||
- </packing>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="position">1</property>
|
||||
+ <property name="position">0</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkHButtonBox" id="buttonbox">
|
||||
+ <object class="GtkAlignment" id="alignment3">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="spacing">6</property>
|
||||
+ <property name="layout_style">end</property>
|
||||
<child>
|
||||
- <object class="GtkLabel" id="auth-banner-label">
|
||||
+ <object class="GtkButton" id="cancel-button">
|
||||
+ <property name="label">gtk-cancel</property>
|
||||
<property name="visible">True</property>
|
||||
- <property name="visible">True</property>
|
||||
- <property name="justify">center</property>
|
||||
- <property name="wrap">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="receives_default">False</property>
|
||||
+ <property name="use_stock">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="position">3</property>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">False</property>
|
||||
+ <property name="position">4</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
- <object class="GtkAlignment" id="alignment3">
|
||||
+ <object class="GtkButton" id="log-in-button">
|
||||
+ <object class="GtkVBox" id="selection-box">
|
||||
<property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="can_default">True</property>
|
||||
+ <property name="has_default">True</property>
|
||||
+ <property name="receives_default">False</property>
|
||||
+ <property name="orientation">vertical</property>
|
||||
+ <property name="spacing">10</property>
|
||||
+ <child>
|
||||
+ <placeholder/>
|
||||
+ </child>
|
||||
<child>
|
||||
- <object class="GtkVBox" id="selection-box">
|
||||
+ <object class="GtkHBox" id="hbox5">
|
||||
+ <object class="GtkHBox" id="auth-input-box">
|
||||
<property name="visible">True</property>
|
||||
- <property name="spacing">10</property>
|
||||
- <child>
|
||||
+ <property name="spacing">6</property>
|
||||
<child>
|
||||
- <placeholder/>
|
||||
- </child>
|
||||
<child>
|
||||
- <child>
|
||||
- <object class="GtkHBox" id="auth-input-box">
|
||||
+ <object class="GtkImage" id="image1">
|
||||
+ <object class="GtkLabel" id="auth-prompt-label">
|
||||
<property name="visible">True</property>
|
||||
- <property name="spacing">6</property>
|
||||
- <child>
|
||||
@ -405,18 +337,20 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
- <child>
|
||||
- <placeholder/>
|
||||
- </child>
|
||||
+ <property name="pixel_size">16</property>
|
||||
+ <accessibility>
|
||||
+ <relation type="label-for" target="auth-prompt-entry"/>
|
||||
+ </accessibility>
|
||||
</object>
|
||||
<packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">False</property>
|
||||
<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="GtkLabel" id="label1">
|
||||
+ <object class="GtkEntry" id="auth-prompt-entry">
|
||||
<property name="visible">True</property>
|
||||
- <child>
|
||||
- <object class="GtkLabel" id="auth-message-label">
|
||||
@ -426,8 +360,13 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
- <property name="position">0</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
+ <property name="xalign">0</property>
|
||||
+ <property name="label" translatable="yes">Log In</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">●</property>
|
||||
+ <property name="activates_default">True</property>
|
||||
+ <accessibility>
|
||||
+ <relation type="labelled-by" target="auth-prompt-label"/>
|
||||
+ </accessibility>
|
||||
</object>
|
||||
<packing>
|
||||
- <property name="expand">False</property>
|
||||
@ -436,10 +375,10 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
+ <property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
- </object>
|
||||
- </child>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="position">4</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
@ -450,58 +389,106 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
- <property name="layout_style">end</property>
|
||||
- <child>
|
||||
- <object class="GtkButton" id="cancel-button">
|
||||
- <property name="label">gtk-cancel</property>
|
||||
- <property name="label">Cancel</property>
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="receives_default">False</property>
|
||||
- <property name="use_stock">True</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">False</property>
|
||||
- <property name="position">4</property>
|
||||
- <property name="position">0</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
- <object class="GtkButton" id="log-in-button">
|
||||
- <object class="GtkButton" id="unlock-button">
|
||||
- <property name="label" translatable="yes">Unlock</property>
|
||||
- <property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="can_default">True</property>
|
||||
- <property name="receives_default">True</property>
|
||||
+ <child>
|
||||
+ <placeholder/>
|
||||
+ </child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
@@ -261,31 +138,88 @@
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
- <object class="GtkButton" id="log-in-button">
|
||||
- <property name="label" translatable="yes">Login</property>
|
||||
+ <object class="GtkHBox" id="auth-message-box">
|
||||
<property name="visible">True</property>
|
||||
- <property name="can_focus">True</property>
|
||||
- <property name="can_default">True</property>
|
||||
- <property name="has_default">True</property>
|
||||
- <property name="receives_default">False</property>
|
||||
- <child>
|
||||
- <object class="GtkHBox" id="hbox5">
|
||||
- <property name="visible">True</property>
|
||||
- <child>
|
||||
- <object class="GtkImage" id="image1">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="pixel_size">16</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="position">0</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- <child>
|
||||
- <object class="GtkLabel" id="label1">
|
||||
- <property name="visible">True</property>
|
||||
- <property name="xalign">0</property>
|
||||
- <property name="label" translatable="yes">Log In</property>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="position">1</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- </object>
|
||||
- </child>
|
||||
- </object>
|
||||
- <packing>
|
||||
- <property name="expand">False</property>
|
||||
- <property name="fill">False</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">5</property>
|
||||
- </packing>
|
||||
- </child>
|
||||
- </object>
|
||||
- <packing>
|
||||
+ <property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
+ </child>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="position">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkHButtonBox" id="buttonbox">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="spacing">6</property>
|
||||
+ <property name="layout_style">end</property>
|
||||
+ <child>
|
||||
+ <object class="GtkButton" id="cancel-button">
|
||||
+ <property name="label">gtk-cancel</property>
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="use_stock">True</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">False</property>
|
||||
+ <property name="position">0</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkButton" id="unlock-button">
|
||||
+ <property name="label" translatable="yes">Unlock</property>
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="can_default">True</property>
|
||||
+ <property name="receives_default">True</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">False</property>
|
||||
+ <property name="position">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkButton" id="log-in-button">
|
||||
+ <property name="label" translatable="yes">Login</property>
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="can_default">True</property>
|
||||
+ <property name="has_default">True</property>
|
||||
+ <property name="receives_default">False</property>
|
||||
+ </object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
- <property name="pack_type">end</property>
|
||||
@ -523,11 +510,11 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui
|
||||
+ </child>
|
||||
+ </object>
|
||||
</interface>
|
||||
Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
|
||||
Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
|
||||
@@ -0,0 +1,235 @@
|
||||
+++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
|
||||
@@ -0,0 +1,225 @@
|
||||
+<?xml version="1.0"?>
|
||||
+<interface>
|
||||
+ <requires lib="gtk+" version="2.16"/>
|
||||
@ -702,46 +689,36 @@ Index: gdm-2.30.2/gui/simple-greeter/gdm-greeter-login-window.ui.new
|
||||
+ <property name="label">gtk-cancel</property>
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="receives_default">False</property>
|
||||
+ <property name="use_stock">True</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">False</property>
|
||||
+ <property name="position">4</property>
|
||||
+ <property name="position">0</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkButton" id="unlock-button">
|
||||
+ <property name="label" translatable="yes">Unlock</property>
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="can_default">True</property>
|
||||
+ <property name="receives_default">True</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">False</property>
|
||||
+ <property name="fill">False</property>
|
||||
+ <property name="position">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkButton" id="log-in-button">
|
||||
+ <property name="label" translatable="yes">Login</property>
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="can_focus">True</property>
|
||||
+ <property name="can_default">True</property>
|
||||
+ <property name="has_default">True</property>
|
||||
+ <property name="receives_default">False</property>
|
||||
+ <child>
|
||||
+ <object class="GtkHBox" id="hbox5">
|
||||
+ <property name="visible">True</property>
|
||||
+ <child>
|
||||
+ <object class="GtkImage" id="image1">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="pixel_size">16</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="position">0</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ <child>
|
||||
+ <object class="GtkLabel" id="label1">
|
||||
+ <property name="visible">True</property>
|
||||
+ <property name="xalign">0</property>
|
||||
+ <property name="label" translatable="yes">Log In</property>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="position">1</property>
|
||||
+ </packing>
|
||||
+ </child>
|
||||
+ </object>
|
||||
+ </child>
|
||||
+ </object>
|
||||
+ <packing>
|
||||
+ <property name="expand">False</property>
|
||||
|
@ -1,29 +0,0 @@
|
||||
Index: gdm-2.31.2/gui/simple-greeter/gdm-greeter-panel.c
|
||||
===================================================================
|
||||
--- gdm-2.31.2.orig/gui/simple-greeter/gdm-greeter-panel.c
|
||||
+++ gdm-2.31.2/gui/simple-greeter/gdm-greeter-panel.c
|
||||
@@ -726,6 +726,7 @@ setup_panel (GdmGreeterPanel *panel)
|
||||
{
|
||||
NaTray *tray;
|
||||
GtkWidget *spacer;
|
||||
+ GdkScreen *screen;
|
||||
int padding;
|
||||
|
||||
gdm_profile_start (NULL);
|
||||
@@ -846,7 +847,15 @@ setup_panel (GdmGreeterPanel *panel)
|
||||
panel->priv->clock = gdm_clock_widget_new ();
|
||||
gtk_box_pack_end (GTK_BOX (panel->priv->hbox),
|
||||
GTK_WIDGET (panel->priv->clock), FALSE, FALSE, 6);
|
||||
- gtk_widget_show (panel->priv->clock);
|
||||
+
|
||||
+ screen = gtk_widget_get_screen (panel->priv->clock);
|
||||
+ if (!screen)
|
||||
+ screen = gdk_screen_get_default ();
|
||||
+
|
||||
+ /* If resolution is limited, hide clock to conserve horizontal space */
|
||||
+
|
||||
+ if (!screen || gdk_screen_get_width (screen) >= 1024)
|
||||
+ gtk_widget_show (panel->priv->clock);
|
||||
|
||||
tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)),
|
||||
GTK_ORIENTATION_HORIZONTAL);
|
@ -22,7 +22,7 @@ Index: daemon/gdm-session-direct.c
|
||||
===================================================================
|
||||
--- daemon/gdm-session-direct.c.orig
|
||||
+++ daemon/gdm-session-direct.c
|
||||
@@ -2120,6 +2120,12 @@ setup_session_environment (GdmSessionDir
|
||||
@@ -2119,6 +2119,12 @@ setup_session_environment (GdmSessionDir
|
||||
}
|
||||
|
||||
|
||||
@ -74,11 +74,3 @@ Index: daemon/gdm-welcome-session.c
|
||||
g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH")));
|
||||
g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (g_getenv ("WINDOWPATH")));
|
||||
g_hash_table_insert (hash, g_strdup ("RUNNING_UNDER_GDM"), g_strdup ("true"));
|
||||
@@ -448,7 +453,6 @@ get_welcome_environment (GdmWelcomeSessi
|
||||
return env;
|
||||
}
|
||||
|
||||
-
|
||||
static gboolean
|
||||
stop_dbus_daemon (GdmWelcomeSession *welcome_session)
|
||||
{
|
||||
|
73
gdm.changes
73
gdm.changes
@ -1,56 +1,67 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 8 05:18:29 CEST 2010 - vuntz@opensuse.org
|
||||
|
||||
- Cleanup update to 2.31.2, based on the 2.30.4 package I did for
|
||||
GNOME:STABLE:2.30.
|
||||
- Drop gdm-save-panel-space-on-low-resolutions.patch: fixed
|
||||
upstream, in a different way.
|
||||
- Drop gdm-add-missing-locale.patch: the file is now in the
|
||||
tarball.
|
||||
- Update gdm-default-wm.patch after code change.
|
||||
- Rebase gdm-greeter-greater-ui.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 30 15:40:22 CEST 2010 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.31.2:
|
||||
+ Add support for legacy "custom" session name
|
||||
+ Various build and warning fixes
|
||||
+ XDMCP fixes
|
||||
+ Add optional support for account service
|
||||
+ Fix crash with multiple user switcher applets
|
||||
+ Gracefully hide control center from user switch menu if not
|
||||
available
|
||||
+ Revert metacity focus workaround, now that metacity is fixed
|
||||
+ Rehide g-p-m context menu
|
||||
+ Updates to work better with newer icon theme
|
||||
+ fix non-source-dir builds
|
||||
+ show username input box when there's no local user
|
||||
+ Various memory leaks
|
||||
+ remove gdm-restart and gdm-stop scripts
|
||||
+ remove text labels from option menus
|
||||
+ various user manager and user chooser fixes and performance
|
||||
+ Show username input box when there's no local user
|
||||
+ Remove gdm-restart and gdm-stop scripts
|
||||
+ Remove text labels from option menus
|
||||
+ Various user manager and user chooser fixes and performance
|
||||
enhancements
|
||||
+ various crasher fixes
|
||||
+ escape names before showing markup
|
||||
+ Escape names before showing markup
|
||||
+ Call button "unlock" not "login" when user is already logged
|
||||
in
|
||||
+ Cap how long ck-history is allowed to run and how far back its
|
||||
allowed to go
|
||||
+ Improvements to the way users are sorted
|
||||
+ ensure slave's children always die with the slave
|
||||
+ halectomy of the last remnants of hal
|
||||
+ don't exit when X fails to start
|
||||
+ trap XAddHosts call
|
||||
+ minor fixes in screenshot tool
|
||||
+ use lsb_release if available to determine system description
|
||||
+ automatically retry on login failure
|
||||
+ improve coverage of test programs
|
||||
+ fix timed login + disable-user-list together
|
||||
+ Ensure slave's children always die with the slave
|
||||
+ Use lsb_release if available to determine system description
|
||||
+ Automatically retry on login failure
|
||||
+ Fix timed login + disable-user-list together
|
||||
+ Don't exit when X fails to start
|
||||
+ Trap XAddHosts call
|
||||
+ Minor fixes in screenshot tool
|
||||
+ Halectomy of the last remnants of hal
|
||||
+ Various crasher fixes
|
||||
+ Various memory leaks
|
||||
+ Various build and warning fixes
|
||||
- Changes from version 2.31.1:
|
||||
+ bgo@594818: Now GDM saves its GConf settings per-seat.
|
||||
+ bgo#617661: Enable FD_CLOEXEC for signal self-pipe
|
||||
+ bgo#594818: Now GDM saves its GConf settings per-seat.
|
||||
+ Improvements so compiling with -DGSEAL_ENABLE works better.
|
||||
+ Use g_remove() to remove directories instead of g_unlink().
|
||||
+ bgo#576801: No longer clear the entry field by setting it to a
|
||||
list of '\b' characters. Now use gtk_editable_delete_text
|
||||
which safely clears the entry field instead.
|
||||
+ bgo#609272: Fix setting of WINDOWPATH so it does not assume the
|
||||
format is 32 bit
|
||||
+ bgo#591937: does not compile when ENODATA is not available.
|
||||
- Drop upstream included gdm-polkit-gnome-path.patch,
|
||||
gdm-xdmcp-uninitialized.patch and gdm-greeter-no-local-user.patch
|
||||
- As no more patches touch translation, remove calls to
|
||||
patch-translation.
|
||||
+ Other bugs fixed: bgo#617661, bgo#576801, bgo#609272,
|
||||
bgo#591937
|
||||
- Rebase gdm-vt-allocation-hack.patch to apply without fuzz.
|
||||
- Rebase gdm-xauthlocalhostname.patch.
|
||||
- Mark gdm-domain-logon.patch as needing a rebase: it's a SLED
|
||||
patch that is intrusive, so we'll see if someone rebases it.
|
||||
Comment out gnome-patch-translation-prepare and
|
||||
gnome-patch-translation-update calls since this patch was the one
|
||||
introducing strings.
|
||||
- Drop gdm-polkit-gnome-path.patch: fixed upstream with a
|
||||
configure option that we already passed
|
||||
(--with-polkit-gnome-directory).
|
||||
- Drop gdm-xdmcp-uninitialized.patch: fixed upstream.
|
||||
- Drop gdm-greeter-no-local-user.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 22 02:39:36 CEST 2010 - vuntz@opensuse.org
|
||||
|
14
gdm.spec
14
gdm.spec
@ -63,12 +63,10 @@ Patch7: gdm-suse-xsession.patch
|
||||
Patch8: gdm-sysconfig-settings.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)
|
||||
Patch9: gdm-domain-logon.patch
|
||||
# PATCH-NEEDS-REBASE 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) (WAS: PATCH-FIX-UPSTREAM bnc#627583)
|
||||
# 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
|
||||
# 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
|
||||
# PATCH-FIX-UPSTREAM gdm-save-panel-space-on-low-resolutions.patch bnc449815 bgo603817 hpj@novell.com -- Hide clock and/or selector labels on low resolutions. (needed because of gdm-domain-logon.patch)
|
||||
Patch19: gdm-save-panel-space-on-low-resolutions.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-selecting-desktop-environment.patch bnc460591 mxwu@novell.com -- Selecting the right desktop environment
|
||||
Patch20: gdm-selecting-desktop-environment.patch
|
||||
# PATCH-FIX-OPENSUSE gdm-gconf-path.patch vuntz@novell.com -- Fix gconf paths to be consistent with the ones used in openSUSE
|
||||
@ -81,8 +79,6 @@ Patch35: gdm-xauthlocalhostname.patch
|
||||
Patch37: gdm-autologin-once.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting
|
||||
Patch40: gdm-look-at-runlevel.patch
|
||||
# PATCH-FIX-UPSTREAM gdm-add-missing-locale.patch captain.magnus@opensuse.org -- Add missing locale.alias file. This patch can be removed with the next version update
|
||||
Patch41: gdm-add-missing-locale.patch
|
||||
# PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux
|
||||
Patch60: gdm-selinux.patch
|
||||
Url: http://www.gnome.org/
|
||||
@ -142,6 +138,7 @@ the GNOME display manager.
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
#gnome-patch-translation-prepare
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch4 -p1
|
||||
@ -149,17 +146,16 @@ translation-update-upstream
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
#%patch9 -p1
|
||||
#%patch15 -p1
|
||||
%patch15 -p1
|
||||
%patch18 -p1
|
||||
%patch19 -p1
|
||||
%patch20 -p1
|
||||
%patch31 -p1
|
||||
%patch34 -p1
|
||||
%patch35 -p0
|
||||
%patch37 -p1
|
||||
%patch40 -p1
|
||||
%patch41 -p1
|
||||
%patch60
|
||||
#gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
libtoolize -f -i
|
||||
@ -235,7 +231,7 @@ fi
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
||||
%dir %config %{_sysconfdir}/gdm
|
||||
%config %{_sysconfdir}/gdm/[IPXl]*
|
||||
%{_sbindir}/*
|
||||
%{_sbindir}/gdm
|
||||
%{_bindir}/*
|
||||
%{_datadir}/gdm
|
||||
%{_datadir}/pixmaps/*.png
|
||||
|
Loading…
x
Reference in New Issue
Block a user