diff options
author | William Jon McCann <jmccann@redhat.com> | 2008-08-19 18:20:43 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2008-08-19 18:20:43 +0000 |
commit | 6c5ff01e72255a8ae77a989d066cabb12d137648 (patch) | |
tree | 7bf4cf17cf25fde6d15782b394780c6ed4a16cd7 /gui | |
parent | 7fd9abfc4f3892320ea1232d0e9da0d055ddd179 (diff) | |
download | gdm-6c5ff01e72255a8ae77a989d066cabb12d137648.tar.gz |
Rename to gdm_chooser_widget_set_activate_on_one_item to make it clear
2008-08-19 William Jon McCann <jmccann@redhat.com>
* gui/simple-greeter/gdm-chooser-widget.c (activate_if_one_item),
(gdm_chooser_widget_set_active_item),
(gdm_chooser_widget_set_activate_on_one_item):
* gui/simple-greeter/gdm-chooser-widget.h:
* gui/simple-greeter/gdm-user-chooser-widget.c (on_users_loaded),
(gdm_user_chooser_widget_constructor):
Rename to gdm_chooser_widget_set_activate_on_one_item to make it
clear that it is basically a property. Set the property before
adding items.
svn path=/trunk/; revision=6392
Diffstat (limited to 'gui')
-rw-r--r-- | gui/simple-greeter/gdm-chooser-widget.c | 16 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-chooser-widget.h | 130 | ||||
-rw-r--r-- | gui/simple-greeter/gdm-user-chooser-widget.c | 18 |
3 files changed, 85 insertions, 79 deletions
diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c index 2cc743d1..4c4ec334 100644 --- a/gui/simple-greeter/gdm-chooser-widget.c +++ b/gui/simple-greeter/gdm-chooser-widget.c @@ -598,14 +598,18 @@ activate_if_one_item (GdmChooserWidget *widget) { char *id; + g_debug ("GdmChooserWidget: attempting to activate single item"); + if (gdm_chooser_widget_get_number_of_items (widget) != 1) { + g_debug ("GdmChooserWidget: unable to activate single item - has %d items", gdm_chooser_widget_get_number_of_items (widget)); return FALSE; } - g_debug ("GdmChooserWidget: activating single item"); id = get_first_item (widget); - gdm_chooser_widget_set_active_item (widget, id); - g_free (id); + if (id != NULL) { + gdm_chooser_widget_set_active_item (widget, id); + g_free (id); + } return FALSE; } @@ -934,6 +938,8 @@ gdm_chooser_widget_set_active_item (GdmChooserWidget *widget, { g_return_if_fail (GDM_IS_CHOOSER_WIDGET (widget)); + g_debug ("GdmChooserWidget: setting active item '%s'", id); + if (id != NULL) { activate_from_item_id (widget, id); } else { @@ -2298,8 +2304,8 @@ gdm_chooser_widget_get_number_of_items (GdmChooserWidget *widget) } void -gdm_chooser_widget_activate_on_one_item (GdmChooserWidget *widget, - gboolean should_activate) +gdm_chooser_widget_set_activate_on_one_item (GdmChooserWidget *widget, + gboolean should_activate) { widget->priv->activate_on_one_item = should_activate; diff --git a/gui/simple-greeter/gdm-chooser-widget.h b/gui/simple-greeter/gdm-chooser-widget.h index 5b2d5013..83a0dfa2 100644 --- a/gui/simple-greeter/gdm-chooser-widget.h +++ b/gui/simple-greeter/gdm-chooser-widget.h @@ -65,71 +65,71 @@ typedef gboolean (*GdmChooserUpdateForeachFunc) (GdmChooserWidget *widg gboolean *is_separate, gpointer data); -GType gdm_chooser_widget_get_type (void); -GtkWidget * gdm_chooser_widget_new (const char *unactive_label, - const char *active_label); - -void gdm_chooser_widget_add_item (GdmChooserWidget *widget, - const char *id, - GdkPixbuf *image, - const char *name, - const char *comment, - gulong priority, - gboolean is_in_use, - gboolean keep_separate); - -void gdm_chooser_widget_update_foreach_item (GdmChooserWidget *widget, - GdmChooserUpdateForeachFunc cb, - gpointer data); - -void gdm_chooser_widget_update_item (GdmChooserWidget *widget, - const char *id, - GdkPixbuf *new_image, - const char *new_name, - const char *new_comment, - gulong priority, - gboolean new_in_use, - gboolean new_is_separate); - -void gdm_chooser_widget_remove_item (GdmChooserWidget *widget, - const char *id); - -gboolean gdm_chooser_widget_lookup_item (GdmChooserWidget *widget, - const char *id, - GdkPixbuf **image, - char **name, - char **comment, - gulong *priority, - gboolean *is_in_use, - gboolean *is_separate); - -char * gdm_chooser_widget_get_active_item (GdmChooserWidget *widget); -void gdm_chooser_widget_set_active_item (GdmChooserWidget *widget, - const char *item); - -void gdm_chooser_widget_set_item_in_use (GdmChooserWidget *widget, - const char *id, - gboolean is_in_use); -void gdm_chooser_widget_set_item_priority (GdmChooserWidget *widget, - const char *id, - gulong priority); -void gdm_chooser_widget_set_item_timer (GdmChooserWidget *widget, - const char *id, - gulong timeout); -void gdm_chooser_widget_set_in_use_message (GdmChooserWidget *widget, - const char *message); - -void gdm_chooser_widget_set_separator_position (GdmChooserWidget *widget, - GdmChooserWidgetPosition position); -void gdm_chooser_widget_set_hide_inactive_items (GdmChooserWidget *widget, - gboolean should_hide); - -void gdm_chooser_widget_activate_selected_item (GdmChooserWidget *widget); - -int gdm_chooser_widget_get_number_of_items (GdmChooserWidget *widget); -void gdm_chooser_widget_activate_on_one_item (GdmChooserWidget *widget, - gboolean should_activate); -void gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget); +GType gdm_chooser_widget_get_type (void); +GtkWidget * gdm_chooser_widget_new (const char *unactive_label, + const char *active_label); + +void gdm_chooser_widget_add_item (GdmChooserWidget *widget, + const char *id, + GdkPixbuf *image, + const char *name, + const char *comment, + gulong priority, + gboolean is_in_use, + gboolean keep_separate); + +void gdm_chooser_widget_update_foreach_item (GdmChooserWidget *widget, + GdmChooserUpdateForeachFunc cb, + gpointer data); + +void gdm_chooser_widget_update_item (GdmChooserWidget *widget, + const char *id, + GdkPixbuf *new_image, + const char *new_name, + const char *new_comment, + gulong priority, + gboolean new_in_use, + gboolean new_is_separate); + +void gdm_chooser_widget_remove_item (GdmChooserWidget *widget, + const char *id); + +gboolean gdm_chooser_widget_lookup_item (GdmChooserWidget *widget, + const char *id, + GdkPixbuf **image, + char **name, + char **comment, + gulong *priority, + gboolean *is_in_use, + gboolean *is_separate); + +char * gdm_chooser_widget_get_active_item (GdmChooserWidget *widget); +void gdm_chooser_widget_set_active_item (GdmChooserWidget *widget, + const char *item); + +void gdm_chooser_widget_set_item_in_use (GdmChooserWidget *widget, + const char *id, + gboolean is_in_use); +void gdm_chooser_widget_set_item_priority (GdmChooserWidget *widget, + const char *id, + gulong priority); +void gdm_chooser_widget_set_item_timer (GdmChooserWidget *widget, + const char *id, + gulong timeout); +void gdm_chooser_widget_set_in_use_message (GdmChooserWidget *widget, + const char *message); + +void gdm_chooser_widget_set_separator_position (GdmChooserWidget *widget, + GdmChooserWidgetPosition position); +void gdm_chooser_widget_set_hide_inactive_items (GdmChooserWidget *widget, + gboolean should_hide); + +void gdm_chooser_widget_activate_selected_item (GdmChooserWidget *widget); + +int gdm_chooser_widget_get_number_of_items (GdmChooserWidget *widget); +void gdm_chooser_widget_set_activate_on_one_item (GdmChooserWidget *widget, + gboolean should_activate); +void gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget); G_END_DECLS diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c index 20750851..f4b96188 100644 --- a/gui/simple-greeter/gdm-user-chooser-widget.c +++ b/gui/simple-greeter/gdm-user-chooser-widget.c @@ -383,8 +383,8 @@ on_users_loaded (GdmUserManager *manager, } gtk_widget_grab_focus (GTK_WIDGET (widget)); - gdm_chooser_widget_activate_on_one_item (GDM_CHOOSER_WIDGET (widget), - TRUE); + gdm_chooser_widget_set_activate_on_one_item (GDM_CHOOSER_WIDGET (widget), + TRUE); } static GObject * @@ -398,11 +398,6 @@ gdm_user_chooser_widget_constructor (GType type, n_construct_properties, construct_properties)); - /* FIXME: make these construct properties */ - gdm_user_chooser_widget_set_show_guest_user (widget, FALSE); - gdm_user_chooser_widget_set_show_auto_user (widget, FALSE); - gdm_user_chooser_widget_set_show_other_user (widget, TRUE); - widget->priv->show_normal_users = !is_user_list_disabled (widget); if (widget->priv->show_normal_users) { @@ -428,10 +423,15 @@ gdm_user_chooser_widget_constructor (GType type, G_CALLBACK (on_user_login_frequency_changed), widget); } else { - gdm_chooser_widget_activate_on_one_item (GDM_CHOOSER_WIDGET (widget), - TRUE); + gdm_chooser_widget_set_activate_on_one_item (GDM_CHOOSER_WIDGET (widget), + TRUE); } + /* FIXME: make these construct properties */ + gdm_user_chooser_widget_set_show_guest_user (widget, FALSE); + gdm_user_chooser_widget_set_show_auto_user (widget, FALSE); + gdm_user_chooser_widget_set_show_other_user (widget, TRUE); + return G_OBJECT (widget); } |