comparison: pidgin/gtkprefs.c
pidgin/gtkprefs.c
- changeset 29721
- fe9238a801b0
- parent 29391
- b3df20769362
- parent 29718
- 3e4240db54a7
- child 29739
- ad8b75ebf7d9
- child 32375
- 9ccb07c70f2a
equal
deleted
inserted
replaced
| 29419:627f6d928553 | 29721:fe9238a801b0 |
|---|---|
| 1409 PIDGIN_PREFS_ROOT "/conversations/tab_side", | 1409 PIDGIN_PREFS_ROOT "/conversations/tab_side", |
| 1410 _("Top"), GTK_POS_TOP, | 1410 _("Top"), GTK_POS_TOP, |
| 1411 _("Bottom"), GTK_POS_BOTTOM, | 1411 _("Bottom"), GTK_POS_BOTTOM, |
| 1412 _("Left"), GTK_POS_LEFT, | 1412 _("Left"), GTK_POS_LEFT, |
| 1413 _("Right"), GTK_POS_RIGHT, | 1413 _("Right"), GTK_POS_RIGHT, |
| 1414 #if GTK_CHECK_VERSION(2,6,0) | |
| 1415 _("Left Vertical"), GTK_POS_LEFT|8, | 1414 _("Left Vertical"), GTK_POS_LEFT|8, |
| 1416 _("Right Vertical"), GTK_POS_RIGHT|8, | 1415 _("Right Vertical"), GTK_POS_RIGHT|8, |
| 1417 #endif | |
| 1418 NULL); | 1416 NULL); |
| 1419 gtk_size_group_add_widget(sg, label); | 1417 gtk_size_group_add_widget(sg, label); |
| 1420 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); | 1418 gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); |
| 1421 | 1419 |
| 1422 names = pidgin_conv_placement_get_options(); | 1420 names = pidgin_conv_placement_get_options(); |
| 1507 pidgin_prefs_labeled_spin_button(vbox, | 1505 pidgin_prefs_labeled_spin_button(vbox, |
| 1508 _("Minimum input area height in lines:"), | 1506 _("Minimum input area height in lines:"), |
| 1509 PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", | 1507 PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", |
| 1510 1, 8, NULL); | 1508 1, 8, NULL); |
| 1511 | 1509 |
| 1512 #if GTK_CHECK_VERSION(2,4,0) && defined _WIN32 | 1510 #ifdef _WIN32 |
| 1513 { | 1511 { |
| 1514 GtkWidget *fontpref, *font_button, *hbox; | 1512 GtkWidget *fontpref, *font_button, *hbox; |
| 1515 const char *font_name; | 1513 const char *font_name; |
| 1516 vbox = pidgin_make_frame(ret, _("Font")); | 1514 vbox = pidgin_make_frame(ret, _("Font")); |
| 1517 | 1515 |
| 2719 } | 2717 } |
| 2720 | 2718 |
| 2721 static int | 2719 static int |
| 2722 prefs_notebook_add_page(const char *text, GtkWidget *page, int ind) | 2720 prefs_notebook_add_page(const char *text, GtkWidget *page, int ind) |
| 2723 { | 2721 { |
| 2724 #if GTK_CHECK_VERSION(2,4,0) | |
| 2725 return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); | 2722 return gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); |
| 2726 #else | |
| 2727 gtk_notebook_append_page(GTK_NOTEBOOK(prefsnotebook), page, gtk_label_new(text)); | |
| 2728 return gtk_notebook_page_num(GTK_NOTEBOOK(prefsnotebook), page); | |
| 2729 #endif | |
| 2730 } | 2723 } |
| 2731 | 2724 |
| 2732 static void | 2725 static void |
| 2733 prefs_notebook_init(void) | 2726 prefs_notebook_init(void) |
| 2734 { | 2727 { |
