Mercurial > pidgin.yaz
diff 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 |
line wrap: on
line diff
--- a/pidgin/gtkimhtmltoolbar.c Wed May 28 18:41:03 2008 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Wed May 28 21:00:40 2008 +0000 @@ -790,7 +790,7 @@ gtk_widget_grab_focus(toolbar->imhtml); } -#ifdef USE_FARSIGHT +#ifdef USE_VV static void init_voice_call_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar) { @@ -826,7 +826,7 @@ gtk_widget_set_sensitive(GTK_WIDGET(toolbar->image), buttons & GTK_IMHTML_IMAGE); gtk_widget_set_sensitive(GTK_WIDGET(toolbar->link), buttons & GTK_IMHTML_LINK); gtk_widget_set_sensitive(GTK_WIDGET(toolbar->smiley), buttons & GTK_IMHTML_SMILEY); -#ifdef USE_FARSIGHT +#ifdef USE_VV gtk_widget_set_sensitive(GTK_WIDGET(toolbar->call), buttons & GTK_IMHTML_CALL); #endif } @@ -1117,7 +1117,7 @@ {PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")}, {PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, insert_image_cb, &toolbar->image, _("Insert IM Image")}, {PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")}, -#ifdef USE_FARSIGHT +#ifdef USE_VV {"", NULL, NULL, NULL}, {PIDGIN_STOCK_TOOLBAR_CALL, init_voice_call_cb, &toolbar->call, _("Call")}, #endif @@ -1187,9 +1187,9 @@ GtkWidget *font_button; GtkWidget *smiley_button; -#ifdef USE_FARSIGHT +#ifdef USE_VV GtkWidget *call_button; -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */ GtkWidget *font_menu; GtkWidget *insert_menu; @@ -1332,7 +1332,7 @@ g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley); gtk_widget_show_all(smiley_button); -#ifdef USE_FARSIGHT +#ifdef USE_VV /* Sep */ sep = gtk_vseparator_new(); gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0); @@ -1352,7 +1352,7 @@ g_signal_connect_swapped(G_OBJECT(call_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->call); gtk_widget_show_all(call_button); -#endif /* USE_FARSIGHT */ +#endif /* USE_VV */ gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0); g_object_set_data(G_OBJECT(hbox), "lean-view", box);