gdm r5848 - in trunk: . gui/simple-greeter
- From: halfline svn gnome org
- To: svn-commits-list gnome org
- Subject: gdm r5848 - in trunk: . gui/simple-greeter
- Date: Mon, 25 Feb 2008 20:45:51 +0000 (GMT)
Author: halfline
Date: Mon Feb 25 20:45:51 2008
New Revision: 5848
URL: http://svn.gnome.org/viewvc/gdm?rev=5848&view=rev
Log:
2008-02-25 Ray Strode <rstrode redhat com>
* gui/simple-greeter/gdm-greeter-client.[ch]:
(on_default_language_name_changed),
(on_default_session_name_changed),
(client_dbus_handle_message),
(gdm_greeter_client_class_init):
* gui/simple-greeter/gdm-greeter-panel.[ch]:
(gdm_greeter_panel_reset):
(gdm_greeter_panel_set_default_language_name):
(gdm_greeter_panel_set_default_session_name):
* gui/simple-greeter/gdm-greeter-session.c
(on_default_language_name_changed):
(on_default_session_name_changed):
Change greeter to use the new slave interface setup in
the last commit
Modified:
trunk/ChangeLog
trunk/gui/simple-greeter/gdm-greeter-client.c
trunk/gui/simple-greeter/gdm-greeter-client.h
trunk/gui/simple-greeter/gdm-greeter-panel.c
trunk/gui/simple-greeter/gdm-greeter-panel.h
trunk/gui/simple-greeter/gdm-greeter-session.c
Modified: trunk/gui/simple-greeter/gdm-greeter-client.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-client.c (original)
+++ trunk/gui/simple-greeter/gdm-greeter-client.c Mon Feb 25 20:45:51 2008
@@ -64,8 +64,8 @@
READY,
RESET,
SELECTED_USER_CHANGED,
- SAVED_LANGUAGE_NAME_READ,
- SAVED_SESSION_NAME_READ,
+ DEFAULT_LANGUAGE_NAME_CHANGED,
+ DEFAULT_SESSION_NAME_CHANGED,
LAST_SIGNAL
};
@@ -134,17 +134,17 @@
}
static void
-on_saved_language_name_read (GdmGreeterClient *client,
- DBusMessage *message)
+on_default_language_name_changed (GdmGreeterClient *client,
+ DBusMessage *message)
{
- emit_string_signal_for_message (client, "SavedLanguageNameRead", message, SAVED_LANGUAGE_NAME_READ);
+ emit_string_signal_for_message (client, "DefaultLanguageNameChanged", message, DEFAULT_LANGUAGE_NAME_CHANGED);
}
static void
-on_saved_session_name_read (GdmGreeterClient *client,
- DBusMessage *message)
+on_default_session_name_changed (GdmGreeterClient *client,
+ DBusMessage *message)
{
- emit_string_signal_for_message (client, "SavedSessionNameRead", message, SAVED_SESSION_NAME_READ);
+ emit_string_signal_for_message (client, "DefaultSessionNameChanged", message, DEFAULT_SESSION_NAME_CHANGED);
}
static void
@@ -520,10 +520,10 @@
on_reset (client, message);
} else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "SelectedUserChanged")) {
on_selected_user_changed (client, message);
- } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "SavedLanguageNameRead")) {
- on_saved_language_name_read (client, message);
- } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "SavedSessionNameRead")) {
- on_saved_session_name_read (client, message);
+ } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultLanguageNameChanged")) {
+ on_default_language_name_changed (client, message);
+ } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultSessionNameChanged")) {
+ on_default_session_name_changed (client, message);
} else {
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
@@ -766,21 +766,21 @@
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
1, G_TYPE_STRING);
- gdm_greeter_client_signals[SAVED_LANGUAGE_NAME_READ] =
- g_signal_new ("saved-language-name-read",
+ gdm_greeter_client_signals[DEFAULT_LANGUAGE_NAME_CHANGED] =
+ g_signal_new ("default-language-name-changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GdmGreeterClientClass, saved_language_name_read),
+ G_STRUCT_OFFSET (GdmGreeterClientClass, default_language_name_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
1, G_TYPE_STRING);
- gdm_greeter_client_signals[SAVED_SESSION_NAME_READ] =
- g_signal_new ("saved-session-name-read",
+ gdm_greeter_client_signals[DEFAULT_SESSION_NAME_CHANGED] =
+ g_signal_new ("default-session-name-changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GdmGreeterClientClass, saved_session_name_read),
+ G_STRUCT_OFFSET (GdmGreeterClientClass, default_session_name_changed),
NULL,
NULL,
g_cclosure_marshal_VOID__STRING,
Modified: trunk/gui/simple-greeter/gdm-greeter-client.h
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-client.h (original)
+++ trunk/gui/simple-greeter/gdm-greeter-client.h Mon Feb 25 20:45:51 2008
@@ -60,11 +60,10 @@
void (* selected_user_changed) (GdmGreeterClient *client,
const char *username);
- void (* saved_session_name_read) (GdmGreeterClient *client,
- const char *session_name);
- void (* saved_language_name_read) (GdmGreeterClient *client,
- const char *language_name);
-
+ void (* default_session_name_changed) (GdmGreeterClient *client,
+ const char *session_name);
+ void (* default_language_name_changed) (GdmGreeterClient *client,
+ const char *language_name);
} GdmGreeterClientClass;
#define GDM_GREETER_CLIENT_ERROR (gdm_greeter_client_error_quark ())
Modified: trunk/gui/simple-greeter/gdm-greeter-panel.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-panel.c (original)
+++ trunk/gui/simple-greeter/gdm-greeter-panel.c Mon Feb 25 20:45:51 2008
@@ -52,6 +52,9 @@
GtkWidget *clock;
GtkWidget *language_option_widget;
GtkWidget *session_option_widget;
+
+ char *default_session_name;
+ char *default_language_name;
};
enum {
@@ -572,22 +575,22 @@
void
gdm_greeter_panel_reset (GdmGreeterPanel *panel)
{
- gdm_greeter_panel_set_language_name_hint (panel, NULL);
- gdm_greeter_panel_set_session_name_hint (panel, NULL);
+ gdm_greeter_panel_set_default_language_name (panel, NULL);
+ gdm_greeter_panel_set_default_session_name (panel, NULL);
gdm_greeter_panel_hide_user_options (panel);
}
void
-gdm_greeter_panel_set_language_name_hint (GdmGreeterPanel *panel,
- const char *language_name)
+gdm_greeter_panel_set_default_language_name (GdmGreeterPanel *panel,
+ const char *language_name)
{
gdm_language_option_widget_set_current_language_name (GDM_LANGUAGE_OPTION_WIDGET (panel->priv->language_option_widget),
language_name);
}
void
-gdm_greeter_panel_set_session_name_hint (GdmGreeterPanel *panel,
- const char *session_name)
+gdm_greeter_panel_set_default_session_name (GdmGreeterPanel *panel,
+ const char *session_name)
{
gdm_session_option_widget_set_current_session (GDM_SESSION_OPTION_WIDGET (panel->priv->session_option_widget),
Modified: trunk/gui/simple-greeter/gdm-greeter-panel.h
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-panel.h (original)
+++ trunk/gui/simple-greeter/gdm-greeter-panel.h Mon Feb 25 20:45:51 2008
@@ -60,9 +60,9 @@
void gdm_greeter_panel_hide_user_options (GdmGreeterPanel *panel);
void gdm_greeter_panel_reset (GdmGreeterPanel *panel);
-void gdm_greeter_panel_set_language_name_hint (GdmGreeterPanel *panel,
+void gdm_greeter_panel_set_default_language_name (GdmGreeterPanel *panel,
const char *language_name);
-void gdm_greeter_panel_set_session_name_hint (GdmGreeterPanel *panel,
+void gdm_greeter_panel_set_default_session_name (GdmGreeterPanel *panel,
const char *session_name);
G_END_DECLS
Modified: trunk/gui/simple-greeter/gdm-greeter-session.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-session.c (original)
+++ trunk/gui/simple-greeter/gdm-greeter-session.c Mon Feb 25 20:45:51 2008
@@ -118,23 +118,23 @@
}
static void
-on_saved_language_name_read (GdmGreeterClient *client,
- const char *text,
- GdmGreeterSession *session)
+on_default_language_name_changed (GdmGreeterClient *client,
+ const char *text,
+ GdmGreeterSession *session)
{
- g_debug ("GdmGreeterSession: saved language name read: %s", text);
- gdm_greeter_panel_set_language_name_hint (GDM_GREETER_PANEL (session->priv->panel),
- text);
+ g_debug ("GdmGreeterSession: default language name changed: %s", text);
+ gdm_greeter_panel_set_default_language_name (GDM_GREETER_PANEL (session->priv->panel),
+ text);
}
static void
-on_saved_session_name_read (GdmGreeterClient *client,
- const char *text,
- GdmGreeterSession *session)
+on_default_session_name_changed (GdmGreeterClient *client,
+ const char *text,
+ GdmGreeterSession *session)
{
- g_debug ("GdmGreeterSession: saved session name read: %s", text);
- gdm_greeter_panel_set_session_name_hint (GDM_GREETER_PANEL (session->priv->panel),
- text);
+ g_debug ("GdmGreeterSession: default session name changed: %s", text);
+ gdm_greeter_panel_set_default_session_name (GDM_GREETER_PANEL (session->priv->panel),
+ text);
}
static void
@@ -714,12 +714,12 @@
G_CALLBACK (on_selected_user_changed),
session);
g_signal_connect (session->priv->client,
- "saved-language-name-read",
- G_CALLBACK (on_saved_language_name_read),
+ "default-language-name-changed",
+ G_CALLBACK (on_default_language_name_changed),
session);
g_signal_connect (session->priv->client,
- "saved-session-name-read",
- G_CALLBACK (on_saved_session_name_read),
+ "default-session-name-changed",
+ G_CALLBACK (on_default_session_name_changed),
session);
/* We want to listen for panel mnemonics even if the
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
