comparison pidgin/gtkprefs.c @ 29759:2debb45f1df8

propagate from branch 'im.pidgin.pidgin' (head 2a58bda0b6d8c5519ef9e41e5f017343ef2cbac0) to branch 'im.pidgin.pidgin.next.minor' (head ef75f5b709bfa7dff26b3d1186cc436f33e78b81)
author Paul Aurich <paul@darkrain42.org>
date Mon, 15 Feb 2010 22:24:26 +0000
parents 2ad2e3490b23
children b473cfd0285f
comparison
equal deleted inserted replaced
29442:0b6cfe040cd0 29759:2debb45f1df8
1417 PIDGIN_PREFS_ROOT "/conversations/tab_side", 1417 PIDGIN_PREFS_ROOT "/conversations/tab_side",
1418 _("Top"), GTK_POS_TOP, 1418 _("Top"), GTK_POS_TOP,
1419 _("Bottom"), GTK_POS_BOTTOM, 1419 _("Bottom"), GTK_POS_BOTTOM,
1420 _("Left"), GTK_POS_LEFT, 1420 _("Left"), GTK_POS_LEFT,
1421 _("Right"), GTK_POS_RIGHT, 1421 _("Right"), GTK_POS_RIGHT,
1422 #if GTK_CHECK_VERSION(2,6,0)
1423 _("Left Vertical"), GTK_POS_LEFT|8, 1422 _("Left Vertical"), GTK_POS_LEFT|8,
1424 _("Right Vertical"), GTK_POS_RIGHT|8, 1423 _("Right Vertical"), GTK_POS_RIGHT|8,
1425 #endif
1426 NULL); 1424 NULL);
1427 gtk_size_group_add_widget(sg, label); 1425 gtk_size_group_add_widget(sg, label);
1428 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); 1426 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
1429 1427
1430 names = pidgin_conv_placement_get_options(); 1428 names = pidgin_conv_placement_get_options();
1515 pidgin_prefs_labeled_spin_button(vbox, 1513 pidgin_prefs_labeled_spin_button(vbox,
1516 _("Minimum input area height in lines:"), 1514 _("Minimum input area height in lines:"),
1517 PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", 1515 PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines",
1518 1, 8, NULL); 1516 1, 8, NULL);
1519 1517
1520 #if GTK_CHECK_VERSION(2,4,0) && defined _WIN32 1518 #ifdef _WIN32
1521 { 1519 {
1522 GtkWidget *fontpref, *font_button, *hbox; 1520 GtkWidget *fontpref, *font_button, *hbox;
1523 const char *font_name; 1521 const char *font_name;
1524 vbox = pidgin_make_frame(ret, _("Font")); 1522 vbox = pidgin_make_frame(ret, _("Font"));
1525 1523
2727 } 2725 }
2728 2726
2729 static int 2727 static int
2730 prefs_notebook_add_page(const char *text, GtkWidget *page, int ind) 2728 prefs_notebook_add_page(const char *text, GtkWidget *page, int ind)
2731 { 2729 {
2732 #if GTK_CHECK_VERSION(2,4,0)
2733 return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); 2730 return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
2734 #else
2735 gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text));
2736 return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page);
2737 #endif
2738 } 2731 }
2739 2732
2740 static void 2733 static void
2741 prefs_notebook_init(void) 2734 prefs_notebook_init(void)
2742 { 2735 {