comparison pidgin/gtkimhtmltoolbar.c @ 25654:cbe97caec684

Use USE_VV instead of USE_FARSIGHT.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 28 May 2008 21:00:40 +0000
parents 92e71f6e10d4
children 10f5a529d2a6
comparison
equal deleted inserted replaced
25653:3f835618356a 25654:cbe97caec684
788 toolbar->smiley_dialog = dialog; 788 toolbar->smiley_dialog = dialog;
789 789
790 gtk_widget_grab_focus(toolbar->imhtml); 790 gtk_widget_grab_focus(toolbar->imhtml);
791 } 791 }
792 792
793 #ifdef USE_FARSIGHT 793 #ifdef USE_VV
794 static void 794 static void
795 init_voice_call_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar) 795 init_voice_call_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar)
796 { 796 {
797 purple_debug_info("gtkimhtmltoolbar", "Call clicked!\n"); 797 purple_debug_info("gtkimhtmltoolbar", "Call clicked!\n");
798 } 798 }
824 buttons & GTK_IMHTML_BACKCOLOR)); 824 buttons & GTK_IMHTML_BACKCOLOR));
825 825
826 gtk_widget_set_sensitive(GTK_WIDGET(toolbar->image), buttons & GTK_IMHTML_IMAGE); 826 gtk_widget_set_sensitive(GTK_WIDGET(toolbar->image), buttons & GTK_IMHTML_IMAGE);
827 gtk_widget_set_sensitive(GTK_WIDGET(toolbar->link), buttons & GTK_IMHTML_LINK); 827 gtk_widget_set_sensitive(GTK_WIDGET(toolbar->link), buttons & GTK_IMHTML_LINK);
828 gtk_widget_set_sensitive(GTK_WIDGET(toolbar->smiley), buttons & GTK_IMHTML_SMILEY); 828 gtk_widget_set_sensitive(GTK_WIDGET(toolbar->smiley), buttons & GTK_IMHTML_SMILEY);
829 #ifdef USE_FARSIGHT 829 #ifdef USE_VV
830 gtk_widget_set_sensitive(GTK_WIDGET(toolbar->call), buttons & GTK_IMHTML_CALL); 830 gtk_widget_set_sensitive(GTK_WIDGET(toolbar->call), buttons & GTK_IMHTML_CALL);
831 #endif 831 #endif
832 } 832 }
833 833
834 /* we call this when we want to _set_active the toggle button, it'll 834 /* we call this when we want to _set_active the toggle button, it'll
1115 {PIDGIN_STOCK_CLEAR, clear_formatting_cb, &toolbar->clear, _("Reset Formatting")}, 1115 {PIDGIN_STOCK_CLEAR, clear_formatting_cb, &toolbar->clear, _("Reset Formatting")},
1116 {"", NULL, NULL, NULL}, 1116 {"", NULL, NULL, NULL},
1117 {PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")}, 1117 {PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")},
1118 {PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, insert_image_cb, &toolbar->image, _("Insert IM Image")}, 1118 {PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, insert_image_cb, &toolbar->image, _("Insert IM Image")},
1119 {PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")}, 1119 {PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")},
1120 #ifdef USE_FARSIGHT 1120 #ifdef USE_VV
1121 {"", NULL, NULL, NULL}, 1121 {"", NULL, NULL, NULL},
1122 {PIDGIN_STOCK_TOOLBAR_CALL, init_voice_call_cb, &toolbar->call, _("Call")}, 1122 {PIDGIN_STOCK_TOOLBAR_CALL, init_voice_call_cb, &toolbar->call, _("Call")},
1123 #endif 1123 #endif
1124 {NULL, NULL, NULL, NULL} 1124 {NULL, NULL, NULL, NULL}
1125 }; 1125 };
1185 GtkWidget *label; 1185 GtkWidget *label;
1186 GtkWidget *insert_button; 1186 GtkWidget *insert_button;
1187 GtkWidget *font_button; 1187 GtkWidget *font_button;
1188 GtkWidget *smiley_button; 1188 GtkWidget *smiley_button;
1189 1189
1190 #ifdef USE_FARSIGHT 1190 #ifdef USE_VV
1191 GtkWidget *call_button; 1191 GtkWidget *call_button;
1192 #endif /* USE_FARSIGHT */ 1192 #endif /* USE_VV */
1193 1193
1194 GtkWidget *font_menu; 1194 GtkWidget *font_menu;
1195 GtkWidget *insert_menu; 1195 GtkWidget *insert_menu;
1196 GtkWidget *menuitem; 1196 GtkWidget *menuitem;
1197 GtkWidget *sep; 1197 GtkWidget *sep;
1330 gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0); 1330 gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
1331 gtk_box_pack_start(GTK_BOX(box), smiley_button, FALSE, FALSE, 0); 1331 gtk_box_pack_start(GTK_BOX(box), smiley_button, FALSE, FALSE, 0);
1332 g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley); 1332 g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley);
1333 gtk_widget_show_all(smiley_button); 1333 gtk_widget_show_all(smiley_button);
1334 1334
1335 #ifdef USE_FARSIGHT 1335 #ifdef USE_VV
1336 /* Sep */ 1336 /* Sep */
1337 sep = gtk_vseparator_new(); 1337 sep = gtk_vseparator_new();
1338 gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0); 1338 gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
1339 gtk_widget_show_all(sep); 1339 gtk_widget_show_all(sep);
1340 1340
1350 gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0); 1350 gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
1351 gtk_box_pack_start(GTK_BOX(box), call_button, FALSE, FALSE, 0); 1351 gtk_box_pack_start(GTK_BOX(box), call_button, FALSE, FALSE, 0);
1352 g_signal_connect_swapped(G_OBJECT(call_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->call); 1352 g_signal_connect_swapped(G_OBJECT(call_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->call);
1353 gtk_widget_show_all(call_button); 1353 gtk_widget_show_all(call_button);
1354 1354
1355 #endif /* USE_FARSIGHT */ 1355 #endif /* USE_VV */
1356 1356
1357 gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0); 1357 gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0);
1358 g_object_set_data(G_OBJECT(hbox), "lean-view", box); 1358 g_object_set_data(G_OBJECT(hbox), "lean-view", box);
1359 gtk_widget_show(box); 1359 gtk_widget_show(box);
1360 1360