pidgin/gtkprefs.c

changeset 37677
0db23c801fde
parent 37653
dfadb1bef243
child 37886
d4ed67195cbf
equal deleted inserted replaced
37676:a30c853356eb 37677:0db23c801fde
1413 GtkWidget *label; 1413 GtkWidget *label;
1414 GtkWidget *combo_box = NULL; 1414 GtkWidget *combo_box = NULL;
1415 GtkWidget *themesel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); 1415 GtkWidget *themesel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
1416 1416
1417 label = gtk_label_new(label_str); 1417 label = gtk_label_new(label_str);
1418 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 1418 gtk_widget_set_halign(label, GTK_ALIGN_START);
1419 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
1419 gtk_size_group_add_widget(label_sg, label); 1420 gtk_size_group_add_widget(label_sg, label);
1420 gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0); 1421 gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
1421 1422
1422 combo_box = prefs_build_theme_combo_box(theme_store, 1423 combo_box = prefs_build_theme_combo_box(theme_store,
1423 purple_prefs_get_string(prefs_path), 1424 purple_prefs_get_string(prefs_path),
1445 1446
1446 themesel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE); 1447 themesel_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PIDGIN_HIG_BOX_SPACE);
1447 gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0); 1448 gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
1448 1449
1449 label = gtk_label_new(label_str); 1450 label = gtk_label_new(label_str);
1450 gtk_misc_set_alignment(GTK_MISC(label), 1, 0.5); 1451 gtk_widget_set_halign(label, GTK_ALIGN_END);
1452 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
1451 gtk_size_group_add_widget(label_sg, label); 1453 gtk_size_group_add_widget(label_sg, label);
1452 gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0); 1454 gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
1453 1455
1454 combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(theme_store)); 1456 combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(theme_store));
1455 1457
1482 /* Instructions */ 1484 /* Instructions */
1483 label = gtk_label_new(_("Select a theme that you would like to use from " 1485 label = gtk_label_new(_("Select a theme that you would like to use from "
1484 "the lists below.\nNew themes can be installed by " 1486 "the lists below.\nNew themes can be installed by "
1485 "dragging and dropping them onto the theme list.")); 1487 "dragging and dropping them onto the theme list."));
1486 1488
1487 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 1489 gtk_widget_set_halign(label, GTK_ALIGN_START);
1490 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
1488 gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT); 1491 gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
1489 1492
1490 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, FALSE, 0); 1493 gtk_box_pack_start(GTK_BOX(vbox), label, TRUE, FALSE, 0);
1491 gtk_widget_show(label); 1494 gtk_widget_show(label);
1492 1495
1742 _("Always"), "always", 1745 _("Always"), "always",
1743 _("On unread messages"), "pending", 1746 _("On unread messages"), "pending",
1744 _("Never"), "never", 1747 _("Never"), "never",
1745 NULL); 1748 NULL);
1746 gtk_size_group_add_widget(sg, label); 1749 gtk_size_group_add_widget(sg, label);
1747 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 1750 gtk_widget_set_halign(label, GTK_ALIGN_START);
1751 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
1748 1752
1749 vbox = pidgin_make_frame(ret, _("Conversation Window")); 1753 vbox = pidgin_make_frame(ret, _("Conversation Window"));
1750 label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"), 1754 label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"),
1751 PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/im/hide_new", 1755 PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
1752 _("Never"), "never", 1756 _("Never"), "never",
1753 _("When away"), "away", 1757 _("When away"), "away",
1754 _("Always"), "always", 1758 _("Always"), "always",
1755 NULL); 1759 NULL);
1756 gtk_size_group_add_widget(sg, label); 1760 gtk_size_group_add_widget(sg, label);
1757 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 1761 gtk_widget_set_halign(label, GTK_ALIGN_START);
1762 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
1758 1763
1759 #ifdef _WIN32 1764 #ifdef _WIN32
1760 pidgin_prefs_checkbox(_("Minimi_ze new conversation windows"), PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", vbox); 1765 pidgin_prefs_checkbox(_("Minimi_ze new conversation windows"), PIDGIN_PREFS_ROOT "/win32/minimize_new_convs", vbox);
1761 #endif 1766 #endif
1762 1767
1788 _("Right"), GTK_POS_RIGHT, 1793 _("Right"), GTK_POS_RIGHT,
1789 _("Left Vertical"), GTK_POS_LEFT|8, 1794 _("Left Vertical"), GTK_POS_LEFT|8,
1790 _("Right Vertical"), GTK_POS_RIGHT|8, 1795 _("Right Vertical"), GTK_POS_RIGHT|8,
1791 NULL); 1796 NULL);
1792 gtk_size_group_add_widget(sg, label); 1797 gtk_size_group_add_widget(sg, label);
1793 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 1798 gtk_widget_set_halign(label, GTK_ALIGN_START);
1799 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
1794 1800
1795 names = pidgin_conv_placement_get_options(); 1801 names = pidgin_conv_placement_get_options();
1796 label = pidgin_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"), 1802 label = pidgin_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"),
1797 PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/placement", names); 1803 PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/placement", names);
1798 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 1804 gtk_widget_set_halign(label, GTK_ALIGN_START);
1805 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
1799 1806
1800 gtk_size_group_add_widget(sg, label); 1807 gtk_size_group_add_widget(sg, label);
1801 1808
1802 g_list_free(names); 1809 g_list_free(names);
1803 1810
2163 gtk_size_group_add_widget(sg, label); 2170 gtk_size_group_add_widget(sg, label);
2164 2171
2165 label = gtk_label_new(NULL); 2172 label = gtk_label_new(NULL);
2166 gtk_label_set_markup(GTK_LABEL(label), 2173 gtk_label_set_markup(GTK_LABEL(label),
2167 _("<span style=\"italic\">Example: stunserver.org</span>")); 2174 _("<span style=\"italic\">Example: stunserver.org</span>"));
2168 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 2175 gtk_widget_set_halign(label, GTK_ALIGN_START);
2176 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2169 gtk_container_add(GTK_CONTAINER(hbox), label); 2177 gtk_container_add(GTK_CONTAINER(hbox), label);
2170 2178
2171 auto_ip_checkbox = pidgin_prefs_checkbox("Use _automatically detected IP address", 2179 auto_ip_checkbox = pidgin_prefs_checkbox("Use _automatically detected IP address",
2172 "/purple/network/auto_ip", vbox); 2180 "/purple/network/auto_ip", vbox);
2173 g_signal_connect(G_OBJECT(auto_ip_checkbox), "clicked", 2181 g_signal_connect(G_OBJECT(auto_ip_checkbox), "clicked",
2404 if (browsers != NULL) { 2412 if (browsers != NULL) {
2405 label = pidgin_prefs_dropdown_from_list(vbox,_("_Browser:"), PURPLE_PREF_STRING, 2413 label = pidgin_prefs_dropdown_from_list(vbox,_("_Browser:"), PURPLE_PREF_STRING,
2406 PIDGIN_PREFS_ROOT "/browsers/browser", 2414 PIDGIN_PREFS_ROOT "/browsers/browser",
2407 browsers); 2415 browsers);
2408 g_list_free(browsers); 2416 g_list_free(browsers);
2409 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 2417 gtk_widget_set_halign(label, GTK_ALIGN_START);
2418 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2410 gtk_size_group_add_widget(sg, label); 2419 gtk_size_group_add_widget(sg, label);
2411 2420
2412 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); 2421 hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
2413 label = pidgin_prefs_dropdown(hbox, _("_Open link in:"), PURPLE_PREF_INT, 2422 label = pidgin_prefs_dropdown(hbox, _("_Open link in:"), PURPLE_PREF_INT,
2414 PIDGIN_PREFS_ROOT "/browsers/place", 2423 PIDGIN_PREFS_ROOT "/browsers/place",
2415 _("Browser default"), PIDGIN_BROWSER_DEFAULT, 2424 _("Browser default"), PIDGIN_BROWSER_DEFAULT,
2416 _("New window"), PIDGIN_BROWSER_NEW_WINDOW, 2425 _("New window"), PIDGIN_BROWSER_NEW_WINDOW,
2417 _("New tab"), PIDGIN_BROWSER_NEW_TAB, 2426 _("New tab"), PIDGIN_BROWSER_NEW_TAB,
2418 NULL); 2427 NULL);
2419 gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 2428 gtk_widget_set_halign(label, GTK_ALIGN_START);
2429 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2420 gtk_size_group_add_widget(sg, label); 2430 gtk_size_group_add_widget(sg, label);
2421 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 2431 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
2422 2432
2423 if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom")) 2433 if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom"))
2424 gtk_widget_set_sensitive(hbox, FALSE); 2434 gtk_widget_set_sensitive(hbox, FALSE);
2530 gtk_grid_set_column_spacing(GTK_GRID(grid), 5); 2540 gtk_grid_set_column_spacing(GTK_GRID(grid), 5);
2531 gtk_grid_set_row_spacing(GTK_GRID(grid), 10); 2541 gtk_grid_set_row_spacing(GTK_GRID(grid), 10);
2532 gtk_container_add(GTK_CONTAINER(prefs_proxy_subframe), grid); 2542 gtk_container_add(GTK_CONTAINER(prefs_proxy_subframe), grid);
2533 2543
2534 label = GTK_LABEL(gtk_label_new_with_mnemonic(_("_Host:"))); 2544 label = GTK_LABEL(gtk_label_new_with_mnemonic(_("_Host:")));
2535 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); 2545 gtk_widget_set_halign(label, GTK_ALIGN_END);
2546 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2536 gtk_grid_attach_full(GTK_GRID(grid), GTK_WIDGET(label), 0, 0, 1, 1, 2547 gtk_grid_attach_full(GTK_GRID(grid), GTK_WIDGET(label), 0, 0, 1, 1,
2537 GTK_FILL, 0, 0, 0); 2548 GTK_FILL, 0, 0, 0);
2538 2549
2539 entry = gtk_entry_new(); 2550 entry = gtk_entry_new();
2540 gtk_label_set_mnemonic_widget(label, entry); 2551 gtk_label_set_mnemonic_widget(label, entry);
2551 gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE); 2562 gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE);
2552 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 2563 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
2553 pidgin_set_accessible_label(entry, label); 2564 pidgin_set_accessible_label(entry, label);
2554 2565
2555 label = GTK_LABEL(gtk_label_new_with_mnemonic(_("P_ort:"))); 2566 label = GTK_LABEL(gtk_label_new_with_mnemonic(_("P_ort:")));
2556 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); 2567 gtk_widget_set_halign(label, GTK_ALIGN_END);
2568 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2557 gtk_grid_attach_full(GTK_GRID(grid), GTK_WIDGET(label), 2, 0, 1, 1, 2569 gtk_grid_attach_full(GTK_GRID(grid), GTK_WIDGET(label), 2, 0, 1, 1,
2558 GTK_FILL, 0, 0, 0); 2570 GTK_FILL, 0, 0, 0);
2559 2571
2560 entry = gtk_spin_button_new_with_range(0, 65535, 1); 2572 entry = gtk_spin_button_new_with_range(0, 65535, 1);
2561 gtk_label_set_mnemonic_widget(label, entry); 2573 gtk_label_set_mnemonic_widget(label, entry);
2569 purple_proxy_info_get_port(proxy_info)); 2581 purple_proxy_info_get_port(proxy_info));
2570 } 2582 }
2571 pidgin_set_accessible_label(entry, label); 2583 pidgin_set_accessible_label(entry, label);
2572 2584
2573 label = GTK_LABEL(gtk_label_new_with_mnemonic(_("User_name:"))); 2585 label = GTK_LABEL(gtk_label_new_with_mnemonic(_("User_name:")));
2574 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); 2586 gtk_widget_set_halign(label, GTK_ALIGN_END);
2587 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2575 gtk_grid_attach_full(GTK_GRID(grid), GTK_WIDGET(label), 0, 1, 1, 1, 2588 gtk_grid_attach_full(GTK_GRID(grid), GTK_WIDGET(label), 0, 1, 1, 1,
2576 GTK_FILL, 0, 0, 0); 2589 GTK_FILL, 0, 0, 0);
2577 2590
2578 entry = gtk_entry_new(); 2591 entry = gtk_entry_new();
2579 gtk_label_set_mnemonic_widget(label, entry); 2592 gtk_label_set_mnemonic_widget(label, entry);
2590 gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE); 2603 gtk_box_set_homogeneous(GTK_BOX(hbox), TRUE);
2591 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); 2604 gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
2592 pidgin_set_accessible_label(entry, label); 2605 pidgin_set_accessible_label(entry, label);
2593 2606
2594 label = GTK_LABEL(gtk_label_new_with_mnemonic(_("Pa_ssword:"))); 2607 label = GTK_LABEL(gtk_label_new_with_mnemonic(_("Pa_ssword:")));
2595 gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); 2608 gtk_widget_set_halign(label, GTK_ALIGN_END);
2609 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
2596 gtk_grid_attach_full(GTK_GRID(grid), GTK_WIDGET(label), 2, 1, 1, 1, 2610 gtk_grid_attach_full(GTK_GRID(grid), GTK_WIDGET(label), 2, 1, 1, 1,
2597 GTK_FILL, 0, 0, 0); 2611 GTK_FILL, 0, 0, 0);
2598 2612
2599 entry = gtk_entry_new(); 2613 entry = gtk_entry_new();
2600 gtk_label_set_mnemonic_widget(label, entry); 2614 gtk_label_set_mnemonic_widget(label, entry);
3137 _("Command"), "custom", 3151 _("Command"), "custom",
3138 #endif /* _WIN32 */ 3152 #endif /* _WIN32 */
3139 _("No sounds"), "none", 3153 _("No sounds"), "none",
3140 NULL); 3154 NULL);
3141 gtk_size_group_add_widget(sg, dd); 3155 gtk_size_group_add_widget(sg, dd);
3142 gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5); 3156 gtk_widget_set_halign(dd, GTK_ALIGN_START);
3157 gtk_widget_set_valign(dd, GTK_ALIGN_CENTER);
3143 3158
3144 entry = gtk_entry_new(); 3159 entry = gtk_entry_new();
3145 gtk_editable_set_editable(GTK_EDITABLE(entry), TRUE); 3160 gtk_editable_set_editable(GTK_EDITABLE(entry), TRUE);
3146 cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command"); 3161 cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command");
3147 if(cmd) 3162 if(cmd)
3308 #if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT) 3323 #if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT)
3309 _("Based on keyboard or mouse use"), "system", 3324 _("Based on keyboard or mouse use"), "system",
3310 #endif 3325 #endif
3311 NULL); 3326 NULL);
3312 gtk_size_group_add_widget(sg, dd); 3327 gtk_size_group_add_widget(sg, dd);
3313 gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5); 3328 gtk_widget_set_halign(dd, GTK_ALIGN_START);
3329 gtk_widget_set_valign(dd, GTK_ALIGN_CENTER);
3314 3330
3315 pidgin_prefs_labeled_spin_button(vbox, 3331 pidgin_prefs_labeled_spin_button(vbox,
3316 _("_Minutes before becoming idle:"), "/purple/away/mins_before_away", 3332 _("_Minutes before becoming idle:"), "/purple/away/mins_before_away",
3317 1, 24 * 60, sg); 3333 1, 24 * 60, sg);
3318 3334
3342 _("Never"), "never", 3358 _("Never"), "never",
3343 _("When away"), "away", 3359 _("When away"), "away",
3344 _("When both away and idle"), "awayidle", 3360 _("When both away and idle"), "awayidle",
3345 NULL); 3361 NULL);
3346 gtk_size_group_add_widget(sg, dd); 3362 gtk_size_group_add_widget(sg, dd);
3347 gtk_misc_set_alignment(GTK_MISC(dd), 0, 0.5); 3363 gtk_widget_set_halign(dd, GTK_ALIGN_START);
3364 gtk_widget_set_valign(dd, GTK_ALIGN_CENTER);
3348 3365
3349 /* Signon status stuff */ 3366 /* Signon status stuff */
3350 vbox = pidgin_make_frame(ret, _("Status at Startup")); 3367 vbox = pidgin_make_frame(ret, _("Status at Startup"));
3351 3368
3352 button = pidgin_prefs_checkbox(_("Use status from last _exit at startup"), 3369 button = pidgin_prefs_checkbox(_("Use status from last _exit at startup"),
3654 3671
3655 tmp = g_strdup_printf(_("Silence threshold: %d%%"), 3672 tmp = g_strdup_printf(_("Silence threshold: %d%%"),
3656 purple_prefs_get_int("/purple/media/audio/silence_threshold")); 3673 purple_prefs_get_int("/purple/media/audio/silence_threshold"));
3657 label = gtk_label_new(tmp); 3674 label = gtk_label_new(tmp);
3658 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); 3675 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
3659 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 3676 gtk_widget_set_halign(label, GTK_ALIGN_START);
3677 gtk_widget_set_valign(label, GTK_ALIGN_CENTER);
3660 g_free(tmp); 3678 g_free(tmp);
3661 threshold = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, 3679 threshold = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,
3662 0, 100, 1); 3680 0, 100, 1);
3663 gtk_box_pack_start(GTK_BOX(vbox), threshold, FALSE, FALSE, 0); 3681 gtk_box_pack_start(GTK_BOX(vbox), threshold, FALSE, FALSE, 0);
3664 gtk_range_set_value(GTK_RANGE(threshold), 3682 gtk_range_set_value(GTK_RANGE(threshold),
3850 } 3868 }
3851 widget = pidgin_prefs_dropdown_from_list(vbox, _("_Device"), 3869 widget = pidgin_prefs_dropdown_from_list(vbox, _("_Device"),
3852 PURPLE_PREF_STRING, pref, devices); 3870 PURPLE_PREF_STRING, pref, devices);
3853 g_list_free_full(devices, g_free); 3871 g_list_free_full(devices, g_free);
3854 gtk_size_group_add_widget(sg, widget); 3872 gtk_size_group_add_widget(sg, widget);
3855 gtk_misc_set_alignment(GTK_MISC(widget), 0, 0.5); 3873 gtk_widget_set_halign(widget, GTK_ALIGN_START);
3874 gtk_widget_set_valign(widget, GTK_ALIGN_CENTER);
3856 3875
3857 g_object_set_data(G_OBJECT(vbox), "device-hbox", 3876 g_object_set_data(G_OBJECT(vbox), "device-hbox",
3858 gtk_widget_get_parent(widget)); 3877 gtk_widget_get_parent(widget));
3859 g_signal_connect_swapped(widget, "destroy", G_CALLBACK(g_free), pref); 3878 g_signal_connect_swapped(widget, "destroy", G_CALLBACK(g_free), pref);
3860 3879
3883 widget = pidgin_prefs_dropdown_from_list(vbox, _("_Plugin"), 3902 widget = pidgin_prefs_dropdown_from_list(vbox, _("_Plugin"),
3884 PURPLE_PREF_STRING, plugin_pref, 3903 PURPLE_PREF_STRING, plugin_pref,
3885 plugins); 3904 plugins);
3886 g_list_free(plugins); 3905 g_list_free(plugins);
3887 gtk_size_group_add_widget(sg, widget); 3906 gtk_size_group_add_widget(sg, widget);
3888 gtk_misc_set_alignment(GTK_MISC(widget), 0, 0.5); 3907 gtk_widget_set_halign(widget, GTK_ALIGN_START);
3908 gtk_widget_set_valign(widget, GTK_ALIGN_CENTER);
3889 3909
3890 /* Setup device preference */ 3910 /* Setup device preference */
3891 devices = get_vv_element_devices(purple_prefs_get_string(plugin_pref)); 3911 devices = get_vv_element_devices(purple_prefs_get_string(plugin_pref));
3892 if (g_list_find_custom(devices, purple_prefs_get_string(device_pref), 3912 if (g_list_find_custom(devices, purple_prefs_get_string(device_pref),
3893 (GCompareFunc)strcmp) == NULL) 3913 (GCompareFunc)strcmp) == NULL)
3899 widget = pidgin_prefs_dropdown_from_list(vbox, _("_Device"), 3919 widget = pidgin_prefs_dropdown_from_list(vbox, _("_Device"),
3900 PURPLE_PREF_STRING, device_pref, 3920 PURPLE_PREF_STRING, device_pref,
3901 devices); 3921 devices);
3902 g_list_free_full(devices, g_free); 3922 g_list_free_full(devices, g_free);
3903 gtk_size_group_add_widget(sg, widget); 3923 gtk_size_group_add_widget(sg, widget);
3904 gtk_misc_set_alignment(GTK_MISC(widget), 0, 0.5); 3924 gtk_widget_set_halign(widget, GTK_ALIGN_START);
3925 gtk_widget_set_valign(widget, GTK_ALIGN_CENTER);
3905 3926
3906 widget = gtk_widget_get_parent(widget); 3927 widget = gtk_widget_get_parent(widget);
3907 g_object_set_data(G_OBJECT(vbox), "size-group", sg); 3928 g_object_set_data(G_OBJECT(vbox), "size-group", sg);
3908 g_object_set_data(G_OBJECT(vbox), "device-hbox", widget); 3929 g_object_set_data(G_OBJECT(vbox), "device-hbox", widget);
3909 purple_prefs_connect_callback(vbox, plugin_pref, vv_plugin_changed_cb, 3930 purple_prefs_connect_callback(vbox, plugin_pref, vv_plugin_changed_cb,

mercurial