Mercurial > pidgin
comparison src/gtkprefs.c @ 11638:3a05b53a589e
[gaim-migrate @ 13914]
Some bits'n'pieces:
A bunch of memory leak fixes
Fix newly created accounts to connect in the currently active global
status
Fix the modify account dialog to only show relevant user options etc.
Update sametime to use some more of the new status stuff, it still
needs more love though.
Some s/online/available/ for consistency across prpls
Fix a racyness in disconnecting connections that want to die (fixes
the Yahoo crash when signing on somewhere else)
Sorry if I caused any conflicts!
committer: Tailor Script <tailor@pidgin.im>
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Mon, 10 Oct 2005 17:59:48 +0000 |
parents | de413ae71cba |
children | 58bc500cf226 |
comparison
equal
deleted
inserted
replaced
11637:cedd48571c90 | 11638:3a05b53a589e |
---|---|
1328 browsers = get_available_browsers(); | 1328 browsers = get_available_browsers(); |
1329 if (browsers != NULL) { | 1329 if (browsers != NULL) { |
1330 label = gaim_gtk_prefs_dropdown_from_list(vbox,_("_Browser:"), GAIM_PREF_STRING, | 1330 label = gaim_gtk_prefs_dropdown_from_list(vbox,_("_Browser:"), GAIM_PREF_STRING, |
1331 "/gaim/gtk/browsers/browser", | 1331 "/gaim/gtk/browsers/browser", |
1332 browsers); | 1332 browsers); |
1333 g_list_free(browsers); | |
1333 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); | 1334 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); |
1334 gtk_size_group_add_widget(sg, label); | 1335 gtk_size_group_add_widget(sg, label); |
1335 | 1336 |
1336 hbox = gtk_hbox_new(FALSE, 0); | 1337 hbox = gtk_hbox_new(FALSE, 0); |
1337 label = gaim_gtk_prefs_dropdown(hbox, _("_Open link in:"), GAIM_PREF_INT, | 1338 label = gaim_gtk_prefs_dropdown(hbox, _("_Open link in:"), GAIM_PREF_INT, |
1385 GtkWidget *ret; | 1386 GtkWidget *ret; |
1386 GtkWidget *vbox; | 1387 GtkWidget *vbox; |
1387 GList *names; | 1388 GList *names; |
1388 GtkWidget *sys_box; | 1389 GtkWidget *sys_box; |
1389 GtkWidget *box; | 1390 GtkWidget *box; |
1391 | |
1390 int syslog_enabled = gaim_prefs_get_bool("/core/logging/log_system"); | 1392 int syslog_enabled = gaim_prefs_get_bool("/core/logging/log_system"); |
1391 | 1393 |
1392 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); | 1394 ret = gtk_vbox_new(FALSE, GAIM_HIG_CAT_SPACE); |
1393 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); | 1395 gtk_container_set_border_width (GTK_CONTAINER (ret), GAIM_HIG_BORDER); |
1394 | 1396 |
1395 vbox = gaim_gtk_make_frame (ret, _("Message Logs")); | 1397 vbox = gaim_gtk_make_frame (ret, _("Message Logs")); |
1396 names = gaim_log_logger_get_options(); | 1398 names = gaim_log_logger_get_options(); |
1397 | 1399 |
1398 gaim_gtk_prefs_dropdown_from_list(vbox, _("Log _Format:"), GAIM_PREF_STRING, | 1400 gaim_gtk_prefs_dropdown_from_list(vbox, _("Log _Format:"), GAIM_PREF_STRING, |
1399 "/core/logging/format", names); | 1401 "/core/logging/format", names); |
1402 | |
1403 g_list_free(names); | |
1400 | 1404 |
1401 gaim_gtk_prefs_checkbox(_("_Log all instant messages"), | 1405 gaim_gtk_prefs_checkbox(_("_Log all instant messages"), |
1402 "/core/logging/log_ims", vbox); | 1406 "/core/logging/log_ims", vbox); |
1403 gaim_gtk_prefs_checkbox(_("Log all c_hats"), | 1407 gaim_gtk_prefs_checkbox(_("Log all c_hats"), |
1404 "/core/logging/log_chats", vbox); | 1408 "/core/logging/log_chats", vbox); |