applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

users: Deal with preloaded users

Browse source 
Now that another panel is using ActUserManager, the one the
user panel is using may already be loaded when it starts up.
It was not dealing with that gracefully.
This commit is contained in:
Matthias Clasen 2013-01-29 16:40:23 -05:00 • committed by Rui Matos
parent 4262cb39d5
commit 8cc06f8413
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
panels/user-accounts/um-user-panel.c
View file

@ -1202,6 +1202,7 @@ setup_main_window (CcUserPanelPrivate *d)
GIcon *icon;
GError *error = NULL;
gchar *names[3];
gboolean loaded;
userlist = get_widget (d, "list-treeview");
store = gtk_list_store_new (NUM_USER_LIST_COLS,
@ -1221,8 +1222,6 @@ setup_main_window (CcUserPanelPrivate *d)
match_user, NULL, NULL);
g_object_unref (model);
g_signal_connect (d->um, "notify::is-loaded", G_CALLBACK (users_loaded), d);
gtk_widget_style_get (userlist, "expander-size", &expander_size, NULL);
gtk_tree_view_set_level_indentation (GTK_TREE_VIEW (userlist), - (expander_size + 6));
@ -1326,6 +1325,12 @@ setup_main_window (CcUserPanelPrivate *d)
"*",
icon);
g_object_unref (icon);
g_object_get (d->um, "is-loaded", &loaded, NULL);
if (loaded)
users_loaded (d->um, NULL, d);
else
g_signal_connect (d->um, "notify::is-loaded", G_CALLBACK (users_loaded), d);
}
static void
@ -1359,13 +1364,13 @@ cc_user_panel_init (CcUserPanel *self)
return;
}
setup_main_window (d);
d->password_dialog = um_password_dialog_new ();
button = get_widget (d, "user-icon-button");
d->photo_dialog = um_photo_dialog_new (button);
d->main_box = get_widget (d, "accounts-vbox");
gtk_widget_reparent (d->main_box, GTK_WIDGET (self));
d->history_dialog = um_history_dialog_new ();
setup_main_window (d);
context = gtk_widget_get_style_context (get_widget (d, "list-scrolledwindow"));
gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);