pidgin/gtkprefs.c

branch
soc.2008.masterpassword
changeset 34045
c6e1b9834463
parent 34034
f508fa47f2ac
child 34088
ec5cab88b722
equal deleted inserted replaced
34044:0a176fe8b867 34045:c6e1b9834463
2368 * as we do not know the order the callbacks are called in, we 2368 * as we do not know the order the callbacks are called in, we
2369 * have to rely on the prefs system, and find the keyring that 2369 * have to rely on the prefs system, and find the keyring that
2370 * is (or will be) used, from there. 2370 * is (or will be) used, from there.
2371 */ 2371 */
2372 2372
2373 keyring = purple_keyring_get_keyring_by_id(val); 2373 keyring = purple_keyring_find_keyring_by_id(val);
2374 2374
2375 if (purple_keyring_get_change_master(keyring)) 2375 if (purple_keyring_get_change_master(keyring))
2376 gtk_widget_set_sensitive(button, TRUE); 2376 gtk_widget_set_sensitive(button, TRUE);
2377 else 2377 else
2378 gtk_widget_set_sensitive(button, FALSE); 2378 gtk_widget_set_sensitive(button, FALSE);
2388 void *prefs; 2388 void *prefs;
2389 const char *keyring_id; 2389 const char *keyring_id;
2390 PurpleKeyring *keyring; 2390 PurpleKeyring *keyring;
2391 2391
2392 keyring_id = purple_prefs_get_string("/purple/keyring/active"); 2392 keyring_id = purple_prefs_get_string("/purple/keyring/active");
2393 keyring = purple_keyring_get_keyring_by_id(keyring_id); 2393 keyring = purple_keyring_find_keyring_by_id(keyring_id);
2394 2394
2395 prefs = purple_prefs_get_handle(); 2395 prefs = purple_prefs_get_handle();
2396 2396
2397 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 2397 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
2398 gtk_container_set_border_width(GTK_CONTAINER (ret), PIDGIN_HIG_BORDER); 2398 gtk_container_set_border_width(GTK_CONTAINER (ret), PIDGIN_HIG_BORDER);

mercurial