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

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=65

Browse Source
This commit is contained in:
OBS User unknown
2008-11-17 15:51:38 +00:00
committed by Git OBS Bridge
parent 4ee251b690
commit 5dff66773b
4 changed files with 587 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

565
gdm-greeter-greater-ui.patch Normal file
View File

@@ -0,0 +1,565 @@
Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c
===================================================================
--- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.c
+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.c
@@ -1414,29 +1414,6 @@ on_user_unchosen (GdmUserChooserWidget
do_cancel (login_window);
}
-static gboolean
-on_computer_info_label_button_press (GtkWidget *widget,
- GdkEventButton *event,
- GdmGreeterLoginWindow *login_window)
-{
- GtkWidget *notebook;
- int current_page;
- int n_pages;
-
- /* switch page */
- notebook = glade_xml_get_widget (login_window->priv->xml, "computer-info-notebook");
- current_page = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
- n_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
-
- if (current_page + 1 < n_pages) {
- gtk_notebook_next_page (GTK_NOTEBOOK (notebook));
- } else {
- gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
- }
-
- return FALSE;
-}
-
static char *
file_read_one_line (const char *filename)
{
@@ -1529,9 +1506,12 @@ create_computer_info (GdmGreeterLoginWin
label = glade_xml_get_widget (login_window->priv->xml, "computer-info-version-label");
if (label != NULL) {
char *version;
+ char *markup;
version = get_system_version ();
- gtk_label_set_text (GTK_LABEL (label), version);
+ markup = g_markup_printf_escaped ("<b>%s</b>", version);
+ gtk_label_set_markup (GTK_LABEL (label), markup);
g_free (version);
+ g_free (markup);
}
gdm_profile_end (NULL);
@@ -1667,9 +1647,6 @@ load_theme (GdmGreeterLoginWindow *login
create_computer_info (login_window);
- box = glade_xml_get_widget (login_window->priv->xml, "computer-info-event-box");
- g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window);
-
switch_mode (login_window, MODE_SELECTION);
gdm_profile_end (NULL);
Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade
===================================================================
--- gdm-2.24.0.orig/gui/simple-greeter/gdm-greeter-login-window.glade
+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <requires-version lib="gtk+" version="2.12"/>
<widget class="GtkWindow" id="window1">
- <property name="height_request">400</property>
<property name="visible">True</property>
<property name="border_width">12</property>
<property name="title" translatable="yes">Authentication Dialog</property>
@@ -13,100 +11,67 @@
<property name="visible">True</property>
<property name="spacing">10</property>
<child>
- <widget class="GtkAlignment" id="alignment1">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkImage" id="logo-image">
<property name="visible">True</property>
- <property name="pixel_size">64</property>
+ <property name="yalign">0</property>
+ <property name="pixel_size">48</property>
<property name="icon_name">computer</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEventBox" id="computer-info-event-box">
- <property name="visible-window">False</property>
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
- <widget class="GtkNotebook" id="computer-info-notebook">
+ <widget class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="show_tabs">False</property>
- <property name="show_border">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="computer-info-name-label">
+ <widget class="GtkLabel" id="computer-info-version-label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Computer Name</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Version</property>
+ <property name="use_markup">True</property>
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkLabel" id="computer-info-name-label">
<property name="visible">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="label" translatable="yes">page 5</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Computer Name</property>
</widget>
<packing>
- <property name="type">tab</property>
- <property name="tab_fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="computer-info-version-label">
+ <widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Version</property>
+ <property name="top_padding">6</property>
+ <child>
+ <widget class="GtkLabel" id="auth-banner-label">
+ <property name="visible">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="xalign">0</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">tab</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- <packing>
- <property name="type">tab</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="auth-banner-label">
- <property name="visible">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="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">True</property>
- </widget>
- <packing>
- <property name="position">3</property>
- </packing>
</child>
<child>
<widget class="GtkAlignment" id="alignment2">
@@ -138,7 +103,7 @@
<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="invisible_char">&#x2022;</property>
<property name="activates_default">True</property>
</widget>
<packing>
@@ -189,7 +154,7 @@
</child>
</widget>
<packing>
- <property name="position">5</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
Index: gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
===================================================================
--- /dev/null
+++ gdm-2.24.0/gui/simple-greeter/gdm-greeter-login-window.glade.new
@@ -0,0 +1,334 @@
+<?xml version="1.0"?>
+<glade-interface>
+ <requires-version lib="gtk+" version="2.12"/>
+ <widget class="GtkWindow" id="window1">
+ <property name="visible">True</property>
+ <property name="border_width">12</property>
+ <property name="title" translatable="yes">Authentication Dialog</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <child>
+ <widget class="GtkVBox" id="window-box">
+ <property name="visible">True</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <widget class="GtkImage" id="logo-image">
+ <property name="visible">True</property>
+ <property name="yalign">0</property>
+ <property name="pixel_size">48</property>
+ <property name="icon_name">computer</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="computer-info-version-label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Version</property>
+ <property name="use_markup">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget 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>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="top_padding">6</property>
+ <child>
+ <widget class="GtkLabel" id="auth-banner-label">
+ <property name="visible">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="xalign">0</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkVBox" id="selection-box">
+ <property name="visible">True</property>
+ <property name="spacing">10</property>
+ <child>
+ <widget class="Custom" id="user-chooser">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="auth-input-box">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="auth-prompt-label">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget 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">&#x2022;</property>
+ <property name="activates_default">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="auth-message-box">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="auth-message-label">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="auth-capslock-box">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="auth-capslock-label">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHButtonBox" id="buttonbox">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="disconnect-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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="label">gtk-disconnect</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="suspend-button">
+ <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="response_id">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">media-playback-pause</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Suspend</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="restart-button">
+ <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="response_id">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image7">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">view-refresh</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Restart</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="shutdown-button">
+ <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="response_id">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image5">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">system-shutdown</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Shut Down</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="cancel-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="log-in-button">
+ <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="response_id">0</property>
+ <child>
+ <widget class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">go-home</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Log In</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</glade-interface>

6
gdm-sysconfig-settings.patch
View File

@@ -22,10 +22,10 @@ index 101b3f4..5e9e9d1 100644
gdm-md5.h \
diff --git a/common/gdm-settings-system-backend.c b/common/gdm-settings-system-backend.c
new file mode 100644
index 0000000..036c28c
index 0000000..4cf6a3a
--- /dev/null
+++ b/common/gdm-settings-system-backend.c
@@ -0,0 +1,283 @@
@@ -0,0 +1,281 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Hans Petter Jansson <hpj@copyleft.no>
@@ -268,8 +268,6 @@ index 0000000..036c28c
+ gboolean res;
+ GError *error;
+
+ gdm_log_set_debug (TRUE);
+
+ backend->priv = GDM_SETTINGS_SYSTEM_BACKEND_GET_PRIVATE (backend);
+
+ backend->priv->filename = g_strdup ("/etc/sysconfig/displaymanager");

11
gdm.changes
View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Nov 12 15:45:57 CST 2008 - hpj@novell.com
- Update gdm-sysconfig-settings.patch, removing debug spew.
-------------------------------------------------------------------
Wed Nov 12 15:18:20 CET 2008 - vuntz@novell.com
- Add gdm-greeter-greater-ui.patch to improve the layout of the
greeter. End of bnc#436431.
-------------------------------------------------------------------
Tue Nov 11 01:11:27 CST 2008 - hpj@novell.com

10
gdm.spec
View File

@@ -57,7 +57,7 @@ PreReq: %insserv_prereq
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.24.0
Release: 9
Release: 10
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -87,6 +87,8 @@ Patch12: gdm-fix-icon-scale.patch
Patch13: gdm-sysconfig-settings.patch
# PATCH-FIX-UPSTREAM gdm-autologin.patch bnc436524 mmeeks@novell.com -- From upstream don't create the greeter when autologging it to save startup time
Patch14: gdm-autologin.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
Patch28: gdm-X_SERVER.patch
# PATCH-SUSE: enable SELinux
Patch60: gdm-selinux.patch
@@ -163,6 +165,7 @@ Authors:
%patch12 -p1
%patch13 -p1
%patch14
%patch15 -p1
%patch28
%patch60
@@ -271,6 +274,11 @@ fi
%files lang -f %{name}.lang
%changelog
* Wed Nov 12 2008 hpj@novell.com
- Update gdm-sysconfig-settings.patch, removing debug spew.
* Wed Nov 12 2008 vuntz@novell.com
- Add gdm-greeter-greater-ui.patch to improve the layout of the
greeter. End of bnc#436431.
* Tue Nov 11 2008 hpj@novell.com
- Update gdm-sysconfig-settings.patch, fixing bnc#440863.
* Sun Nov 09 2008 jpr@novell.com