comparison: pidgin/plugins/xmppconsole.c
pidgin/plugins/xmppconsole.c
- branch
- next.minor
- changeset 29499
- 08832cbd946b
- parent 27264
- ff58193d8ead
- child 29529
- b98e0b2e81ad
equal
deleted
inserted
replaced
| 29498:6003eba1e2e2 | 29499:08832cbd946b |
|---|---|
| 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; |
| 732 GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL); | 729 GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL); |
| 733 GtkWidget *label; | 730 GtkWidget *label; |
| 734 GtkTextBuffer *buffer; | 731 GtkTextBuffer *buffer; |
| 735 GtkWidget *toolbar; | 732 GtkWidget *toolbar; |
| 736 GList *connections; | 733 GList *connections; |
| 737 #if GTK_CHECK_VERSION(2,4,0) | |
| 738 GtkToolItem *button; | 734 GtkToolItem *button; |
| 739 #endif | |
| 740 | 735 |
| 741 if (console) { | 736 if (console) { |
| 742 gtk_window_present(GTK_WINDOW(console->window)); | 737 gtk_window_present(GTK_WINDOW(console->window)); |
| 743 return; | 738 return; |
| 744 } | 739 } |
| 781 gtk_imhtml_append_text(GTK_IMHTML(console->imhtml), | 776 gtk_imhtml_append_text(GTK_IMHTML(console->imhtml), |
| 782 _("<font color='#777777'>Not connected to XMPP</font>"), 0); | 777 _("<font color='#777777'>Not connected to XMPP</font>"), 0); |
| 783 gtk_container_add(GTK_CONTAINER(sw), console->imhtml); | 778 gtk_container_add(GTK_CONTAINER(sw), console->imhtml); |
| 784 | 779 |
| 785 toolbar = gtk_toolbar_new(); | 780 toolbar = gtk_toolbar_new(); |
| 786 #if GTK_CHECK_VERSION(2,4,0) | |
| 787 button = gtk_tool_button_new(NULL, "<iq/>"); | 781 button = gtk_tool_button_new(NULL, "<iq/>"); |
| 788 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(iq_clicked_cb), NULL); | 782 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(iq_clicked_cb), NULL); |
| 789 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); | 783 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); |
| 790 #else | 784 |
| 791 gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<iq/>", | |
| 792 _("Insert an <iq/> stanza."), "foo", NULL, GTK_SIGNAL_FUNC(iq_clicked_cb), NULL); | |
| 793 #endif | |
| 794 | |
| 795 #if GTK_CHECK_VERSION(2,4,0) | |
| 796 button = gtk_tool_button_new(NULL, "<presence/>"); | 785 button = gtk_tool_button_new(NULL, "<presence/>"); |
| 797 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(presence_clicked_cb), NULL); | 786 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(presence_clicked_cb), NULL); |
| 798 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); | 787 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); |
| 799 #else | 788 |
| 800 gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<presence/>", | |
| 801 _("Insert a <presence/> stanza."), NULL, gtk_label_new(NULL), GTK_SIGNAL_FUNC(presence_clicked_cb), NULL); | |
| 802 #endif | |
| 803 | |
| 804 #if GTK_CHECK_VERSION(2,4,0) | |
| 805 button = gtk_tool_button_new(NULL, "<message/>"); | 789 button = gtk_tool_button_new(NULL, "<message/>"); |
| 806 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(message_clicked_cb), NULL); | 790 g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(message_clicked_cb), NULL); |
| 807 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); | 791 gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(button)); |
| 808 #else | |
| 809 gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), "<message/>", | |
| 810 _("Insert a <message/> stanza."), "foo", gtk_label_new(NULL), GTK_SIGNAL_FUNC(message_clicked_cb), NULL); | |
| 811 #endif | |
| 812 | 792 |
| 813 gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); | 793 gtk_box_pack_start(GTK_BOX(vbox), toolbar, FALSE, FALSE, 0); |
| 814 | 794 |
| 815 sw = gtk_scrolled_window_new(NULL, NULL); | 795 sw = gtk_scrolled_window_new(NULL, NULL); |
| 816 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_ETCHED_IN); | 796 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_ETCHED_IN); |
