summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2008-02-26 21:08:31 +0000
committerRay Strode <halfline@src.gnome.org>2008-02-26 21:08:31 +0000
commitcc01b15ecaa5d67479cf7f15f05b3663fd3c8f6b (patch)
treecc41ac953c3e61e844eb8456c02f7ba82db8b63d
parentb752ac984c940280d1552ba67612a99fc2b09ad4 (diff)
downloadgdm-cc01b15ecaa5d67479cf7f15f05b3663fd3c8f6b.tar.gz
Track is_loaded status by whether either session or language are
2008-02-26 Ray Strode <rstrode@redhat.com> * daemon/gdm-session-settings.c (gdm_session_settings_is_loaded): Track is_loaded status by whether either session or language are explicitly set instead of relying on a boolean that wasn't being kept in sync. svn path=/trunk/; revision=5877
-rw-r--r--ChangeLog8
-rw-r--r--daemon/gdm-session-settings.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 05f8bc2f..536fef55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-26 Ray Strode <rstrode@redhat.com>
+
+ * daemon/gdm-session-settings.c
+ (gdm_session_settings_is_loaded):
+ Track is_loaded status by whether either session or
+ language are explicitly set instead of relying on a
+ boolean that wasn't being kept in sync.
+
2008-02-26 William Jon McCann <jmccann@redhat.com>
* gui/simple-greeter/gdm-greeter-panel.c:
diff --git a/daemon/gdm-session-settings.c b/daemon/gdm-session-settings.c
index 17c0231d..22bae824 100644
--- a/daemon/gdm-session-settings.c
+++ b/daemon/gdm-session-settings.c
@@ -36,8 +36,6 @@ struct _GdmSessionSettingsPrivate
{
char *session_name;
char *language_name;
-
- guint is_loaded : 1;
};
static void gdm_session_settings_finalize (GObject *object);
@@ -226,7 +224,8 @@ gdm_session_settings_new (void)
gboolean
gdm_session_settings_is_loaded (GdmSessionSettings *settings)
{
- return settings->priv->is_loaded;
+ return settings->priv->session_name != NULL ||
+ settings->priv->language_name != NULL;
}
gboolean