comparison: pidgin/plugins/xmppconsole.c
pidgin/plugins/xmppconsole.c
- branch
- next.minor
- changeset 29529
- b98e0b2e81ad
- parent 28620
- 3f3ead51e915
- parent 29499
- 08832cbd946b
- child 29783
- 96ab389c9181
equal
deleted
inserted
replaced
| 28621:e9f7747ff365 | 29529:b98e0b2e81ad |
|---|---|
| 24 #include "version.h" | 24 #include "version.h" |
| 25 #include "prpl.h" | 25 #include "prpl.h" |
| 26 #include "xmlnode.h" | 26 #include "xmlnode.h" |
| 27 | 27 |
| 28 #include "gtkimhtml.h" | 28 #include "gtkimhtml.h" |
| 29 #if !GTK_CHECK_VERSION(2,4,0) | |
| 30 #include "pidgincombobox.h" | |
| 31 #endif | |
| 32 #include "gtkutils.h" | 29 #include "gtkutils.h" |
| 33 | 30 |
| 34 typedef struct { | 31 typedef struct { |
| 35 PurpleConnection *gc; | 32 PurpleConnection *gc; |
| 36 GtkWidget *window; | 33 GtkWidget *window; |
| 731 GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL); | 728 GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL); |
| 732 GtkWidget *label; | 729 GtkWidget *label; |
| 733 GtkTextBuffer *buffer; | 730 GtkTextBuffer *buffer; |
| 734 GtkWidget *toolbar; | 731 GtkWidget *toolbar; |
| 735 GList *connections; | 732 GList *connections; |
| 736 #if GTK_CHECK_VERSION(2,4,0) | |
| 737 GtkToolItem *button; | 733 GtkToolItem *button; |
| 738 #endif | |
| 739 | 734 |
| 740 if (console) { | 735 if (console) { |
| 741 gtk_window_present(GTK_WINDOW(console->window)); | 736 gtk_window_present(GTK_WINDOW(console->window)); |
| 742 return; | 737 return; |
| 743 } | 738 } |
| 780 gtk_imhtml_append_text(GTK_IMHTML(console->imhtml), | 775 gtk_imhtml_append_text(GTK_IMHTML(console->imhtml), |
| 781 _("<font color='#777777'>Not connected to XMPP</font>"), 0); | 776 _("<font color='#777777'>Not connected to XMPP</font>"), 0); |
| 782 gtk_container_add(GTK_CONTAINER(sw), console->imhtml); | 777 gtk_container_add(GTK_CONTAINER(sw), console->imhtml); |
| 783 | 778 |
| 784 toolbar = gtk_toolbar_new(); | 779 toolbar = gtk_toolbar_new(); |
| 785 #if GTK_CHECK_VERSION(2,4,0) | |
| 786 button = gtk_tool_button_new(NULL, "<iq/>"); | 780 button = gtk_tool_button_new(NULL, "<iq/>"); |
| 787 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(iq_clicked_cb), NULL); | 781 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(iq_clicked_cb), NULL); |
| 788 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); | 782 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); |
| 789 #else | 783 |
| 790 gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<iq/>", | |
| 791 _("Insert an <iq/> stanza."), "foo", NULL, GTK_SIGNAL_FUNC(iq_clicked_cb), NULL); | |
| 792 #endif | |
| 793 | |
| 794 #if GTK_CHECK_VERSION(2,4,0) | |
| 795 button = gtk_tool_button_new(NULL, "<presence/>"); | 784 button = gtk_tool_button_new(NULL, "<presence/>"); |
| 796 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(presence_clicked_cb), NULL); | 785 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(presence_clicked_cb), NULL); |
| 797 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); | 786 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); |
| 798 #else | 787 |
| 799 gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<presence/>", | |
| 800 _("Insert a <presence/> stanza."), NULL, gtk_label_new(NULL), GTK_SIGNAL_FUNC(presence_clicked_cb), NULL); | |
| 801 #endif | |
| 802 | |
| 803 #if GTK_CHECK_VERSION(2,4,0) | |
| 804 button = gtk_tool_button_new(NULL, "<message/>"); | 788 button = gtk_tool_button_new(NULL, "<message/>"); |
| 805 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(message_clicked_cb), NULL); | 789 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(message_clicked_cb), NULL); |
| 806 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); | 790 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); |
| 807 #else | |
| 808 gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<message/>", | |
| 809 _("Insert a <message/> stanza."), "foo", gtk_label_new(NULL), GTK_SIGNAL_FUNC(message_clicked_cb), NULL); | |
| 810 #endif | |
| 811 | 791 |
| 812 gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); | 792 gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); |
| 813 | 793 |
| 814 sw = gtk_scrolled_window_new(NULL, NULL); | 794 sw = gtk_scrolled_window_new(NULL, NULL); |
| 815 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_ETCHED_IN); | 795 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_ETCHED_IN); |
