Mercurial > pidgin.yaz

comparison src/gtkimhtmltoolbar.c @ 8319:a2c5537a814b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 9043] This fixes the symbol collision, incorrect data types, lack of casting, unused variables, and comments inside comments that were preventing the new toolbar code from compiling in some cases here. committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Mon, 23 Feb 2004 22:13:43 +0000
parents 6f549c1d0829
children 5c6c8d48946f
comparison
equal deleted inserted replaced
8318:e45e19951e55 8319:a2c5537a814b
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21 * 21 *
22 */ 22 */
23 23 #include "gtkinternal.h"
24 #include <gtk/gtk.h> 24
25 #include <gtk/gtkvbox.h>
26 #include "gtkimhtmltoolbar.h" 25 #include "gtkimhtmltoolbar.h"
27 #include "gtkutils.h" 26 #include "gtkutils.h"
27
28 #include "imgstore.h"
28 #include "notify.h" 29 #include "notify.h"
29 #include "request.h" 30 #include "request.h"
30 #include "stock.h" 31 #include "stock.h"
31 #include "internal.h"
32 #include "ui.h" 32 #include "ui.h"
33 #include "util.h"
33 34
34 static GtkVBoxClass *parent_class = NULL; 35 static GtkVBoxClass *parent_class = NULL;
35 36
36 static void do_bold(GtkWidget *bold, GtkIMHtmlToolbar *toolbar) 37 static void do_bold(GtkWidget *bold, GtkIMHtmlToolbar *toolbar)
37 { 38 {
109 } 110 }
110 111
111 static void 112 static void
112 toggle_font(GtkWidget *font, GtkIMHtmlToolbar *toolbar) 113 toggle_font(GtkWidget *font, GtkIMHtmlToolbar *toolbar)
113 { 114 {
115 #if 0
114 char fonttif[128]; 116 char fonttif[128];
115 const char *fontface; 117 const char *fontface;
116 118 #endif
119
117 g_return_if_fail(toolbar); 120 g_return_if_fail(toolbar);
118 121
119 if (!toolbar->font_dialog) { 122 if (!toolbar->font_dialog) {
120 toolbar->font_dialog = gtk_font_selection_dialog_new(_("Select Font")); 123 toolbar->font_dialog = gtk_font_selection_dialog_new(_("Select Font"));
121 124
122 g_object_set_data(G_OBJECT(toolbar->font_dialog), "gaim_toolbar", toolbar); 125 g_object_set_data(G_OBJECT(toolbar->font_dialog), "gaim_toolbar", toolbar);
123 126
124 /* if (gtkconv->fontface[0]) { 127 /* if (gtkconv->fontface[0]) {
125 g_snprintf(fonttif, sizeof(fonttif), "%s 12", gtkconv->fontface); 128 g_snprintf(fonttif, sizeof(fonttif), "%s 12", gtkconv->fontface);
126 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(gtkconv->dialogs.font), 129 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(gtkconv->dialogs.font),
127 fonttif); 130 fonttif);
128 } else { 131 } else {
129 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(gtkconv->dialogs.font), 132 gtk_font_selection_dialog_set_font_name(GTK_FONT_SELECTION_DIALOG(gtkconv->dialogs.font),
130 DEFAULT_FONT_FACE); 133 DEFAULT_FONT_FACE);
131 } 134 }
132 */ 135 */
133 136
134 g_signal_connect(G_OBJECT(toolbar->font_dialog), "delete_event", 137 g_signal_connect(G_OBJECT(toolbar->font_dialog), "delete_event",
135 G_CALLBACK(toolbar_cancel_font), toolbar); 138 G_CALLBACK(toolbar_cancel_font), toolbar);
136 g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->ok_button), 139 g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->ok_button),
137 "clicked", G_CALLBACK(apply_font), toolbar->font_dialog); 140 "clicked", G_CALLBACK(apply_font), toolbar->font_dialog);
138 g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), 141 g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button),
139 "clicked", G_CALLBACK(toolbar_cancel_font), toolbar); 142 "clicked", G_CALLBACK(toolbar_cancel_font), toolbar);
140 143
141 144
142 gtk_window_present(GTK_WINDOW(toolbar->font_dialog)); 145 gtk_window_present(GTK_WINDOW(toolbar->font_dialog));
143 } else { 146 } else {
144 toolbar_cancel_font(NULL, toolbar); 147 toolbar_cancel_font(NULL, toolbar);
145 } 148 }
146 gtk_widget_grab_focus(toolbar->imhtml); 149 gtk_widget_grab_focus(toolbar->imhtml);
147 } 150 }
148 151
149 static void cancel_toolbar_fgcolor(GtkWidget *widget, GtkIMHtmlToolbar *toolbar) 152 static void cancel_toolbar_fgcolor(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
150 { 153 {
151 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->fgcolor), FALSE); 154 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->fgcolor), FALSE);
152 gtk_widget_destroy(toolbar->fgcolor_dialog); 155 gtk_widget_destroy(toolbar->fgcolor_dialog);
153 toolbar->fgcolor_dialog = NULL; 156 toolbar->fgcolor_dialog = NULL;
154 } 157 }
155 158
156 static void do_fgcolor(GtkWidget *widget, GtkColorSelection *colorsel) 159 static void do_fgcolor(GtkWidget *widget, GtkColorSelection *colorsel)
174 static void 177 static void
175 toggle_fg_color(GtkWidget *color, GtkIMHtmlToolbar *toolbar) 178 toggle_fg_color(GtkWidget *color, GtkIMHtmlToolbar *toolbar)
176 { 179 {
177 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(color))) { 180 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(color))) {
178 GtkWidget *colorsel; 181 GtkWidget *colorsel;
179 GdkColor fgcolor; 182 /* GdkColor fgcolor; */
180 183
181 /*gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"), 184 /*gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"),
182 &fgcolor);*/ 185 &fgcolor);*/
183 if (!toolbar->fgcolor_dialog) { 186 if (!toolbar->fgcolor_dialog) {
184 187
185 toolbar->fgcolor_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); 188 toolbar->fgcolor_dialog = gtk_color_selection_dialog_new(_("Select Text Color"));
186 colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->colorsel; 189 colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->colorsel;
187 //gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &fgcolor); 190 //gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &fgcolor);
188 g_object_set_data(G_OBJECT(colorsel), "gaim_toolbar", toolbar); 191 g_object_set_data(G_OBJECT(colorsel), "gaim_toolbar", toolbar);
189 192
190 g_signal_connect(G_OBJECT(toolbar->fgcolor_dialog), "delete_event", 193 g_signal_connect(G_OBJECT(toolbar->fgcolor_dialog), "delete_event",
191 G_CALLBACK(cancel_toolbar_fgcolor), toolbar); 194 G_CALLBACK(cancel_toolbar_fgcolor), toolbar);
192 g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->ok_button), 195 g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->ok_button),
193 "clicked", G_CALLBACK(do_fgcolor), colorsel); 196 "clicked", G_CALLBACK(do_fgcolor), colorsel);
194 g_signal_connect(G_OBJECT 197 g_signal_connect(G_OBJECT
195 (GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->cancel_button), 198 (GTK_COLOR_SELECTION_DIALOG(toolbar->fgcolor_dialog)->cancel_button),
196 "clicked", G_CALLBACK(cancel_toolbar_fgcolor), toolbar); 199 "clicked", G_CALLBACK(cancel_toolbar_fgcolor), toolbar);
197 200
198 } 201 }
199 gtk_window_present(toolbar->fgcolor_dialog); 202 gtk_window_present(GTK_WINDOW(toolbar->fgcolor_dialog));
200 } else if (toolbar->fgcolor_dialog != NULL) { 203 } else if (toolbar->fgcolor_dialog != NULL) {
201 cancel_toolbar_fgcolor(color, toolbar); 204 cancel_toolbar_fgcolor(color, toolbar);
202 } else { 205 } else {
203 //gaim_gtk_advance_past(gtkconv, "<FONT COLOR>", "</FONT>"); 206 //gaim_gtk_advance_past(gtkconv, "<FONT COLOR>", "</FONT>");
204 } 207 }
233 static void 236 static void
234 toggle_bg_color(GtkWidget *color, GtkIMHtmlToolbar *toolbar) 237 toggle_bg_color(GtkWidget *color, GtkIMHtmlToolbar *toolbar)
235 { 238 {
236 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(color))) { 239 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(color))) {
237 GtkWidget *colorsel; 240 GtkWidget *colorsel;
238 GdkColor bgcolor; 241 /* GdkColor bgcolor; */
239 242
240 /*gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"), 243 /*gdk_color_parse(gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"),
241 &bgcolor);*/ 244 &bgcolor);*/
242 if (!toolbar->bgcolor_dialog) { 245 if (!toolbar->bgcolor_dialog) {
243 246
244 toolbar->bgcolor_dialog = gtk_color_selection_dialog_new(_("Select Text Color")); 247 toolbar->bgcolor_dialog = gtk_color_selection_dialog_new(_("Select Text Color"));
245 colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->colorsel; 248 colorsel = GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->colorsel;
246 //gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &bgcolor); 249 //gtk_color_selection_set_current_color(GTK_COLOR_SELECTION(colorsel), &bgcolor);
247 g_object_set_data(G_OBJECT(colorsel), "gaim_toolbar", toolbar); 250 g_object_set_data(G_OBJECT(colorsel), "gaim_toolbar", toolbar);
248 251
249 g_signal_connect(G_OBJECT(toolbar->bgcolor_dialog), "delete_event", 252 g_signal_connect(G_OBJECT(toolbar->bgcolor_dialog), "delete_event",
250 G_CALLBACK(cancel_toolbar_bgcolor), toolbar); 253 G_CALLBACK(cancel_toolbar_bgcolor), toolbar);
251 g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->ok_button), 254 g_signal_connect(G_OBJECT(GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->ok_button),
252 "clicked", G_CALLBACK(do_bgcolor), colorsel); 255 "clicked", G_CALLBACK(do_bgcolor), colorsel);
253 g_signal_connect(G_OBJECT 256 g_signal_connect(G_OBJECT
254 (GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->cancel_button), 257 (GTK_COLOR_SELECTION_DIALOG(toolbar->bgcolor_dialog)->cancel_button),
255 "clicked", G_CALLBACK(cancel_toolbar_bgcolor), toolbar); 258 "clicked", G_CALLBACK(cancel_toolbar_bgcolor), toolbar);
256 259
257 } 260 }
258 gtk_window_present(toolbar->bgcolor_dialog); 261 gtk_window_present(GTK_WINDOW(toolbar->bgcolor_dialog));
259 } else if (toolbar->bgcolor_dialog != NULL) { 262 } else if (toolbar->bgcolor_dialog != NULL) {
260 cancel_toolbar_bgcolor(color, toolbar); 263 cancel_toolbar_bgcolor(color, toolbar);
261 } else { 264 } else {
262 //gaim_gtk_advance_past(gtkconv, "<FONT COLOR>", "</FONT>"); 265 //gaim_gtk_advance_past(gtkconv, "<FONT COLOR>", "</FONT>");
263 } 266 }
265 } 268 }
266 269
267 static void 270 static void
268 cancel_link_cb(GtkIMHtmlToolbar *toolbar, GaimRequestFields *fields) 271 cancel_link_cb(GtkIMHtmlToolbar *toolbar, GaimRequestFields *fields)
269 { 272 {
270 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->link), FALSE); 273 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->link), FALSE);
271 toolbar->link_dialog = NULL; 274 toolbar->link_dialog = NULL;
272 } 275 }
273 276
274 static void 277 static void
275 close_link_dialog(GtkIMHtmlToolbar *toolbar) 278 close_link_dialog(GtkIMHtmlToolbar *toolbar)
291 294
292 if (description == NULL) 295 if (description == NULL)
293 description = url; 296 description = url;
294 297
295 gtk_imhtml_insert_link(GTK_IMHTML(toolbar->imhtml), url, description); 298 gtk_imhtml_insert_link(GTK_IMHTML(toolbar->imhtml), url, description);
296 299
297 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->link), FALSE); 300 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->link), FALSE);
298 301
299 toolbar->link_dialog = NULL; 302 toolbar->link_dialog = NULL;
300 } 303 }
301 304
304 { 307 {
305 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->link))) { 308 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->link))) {
306 GaimRequestFields *fields; 309 GaimRequestFields *fields;
307 GaimRequestFieldGroup *group; 310 GaimRequestFieldGroup *group;
308 GaimRequestField *field; 311 GaimRequestField *field;
309 312
310 fields = gaim_request_fields_new(); 313 fields = gaim_request_fields_new();
311 314
312 group = gaim_request_field_group_new(NULL); 315 group = gaim_request_field_group_new(NULL);
313 gaim_request_fields_add_group(fields, group); 316 gaim_request_fields_add_group(fields, group);
314 317
315 field = gaim_request_field_string_new("url", _("_URL"), NULL, FALSE); 318 field = gaim_request_field_string_new("url", _("_URL"), NULL, FALSE);
316 gaim_request_field_set_required(field, TRUE); 319 gaim_request_field_set_required(field, TRUE);
317 gaim_request_field_group_add_field(group, field); 320 gaim_request_field_group_add_field(group, field);
318 321
319 field = gaim_request_field_string_new("description", _("_Description"), 322 field = gaim_request_field_string_new("description", _("_Description"),
320 NULL, FALSE); 323 NULL, FALSE);
321 gaim_request_field_group_add_field(group, field); 324 gaim_request_field_group_add_field(group, field);
322 325
323 toolbar->link_dialog = 326 toolbar->link_dialog =
324 gaim_request_fields(toolbar, _("Insert Link"), 327 gaim_request_fields(toolbar, _("Insert Link"),
325 NULL, 328 NULL,
326 _("Please enter the URL and description of the " 329 _("Please enter the URL and description of the "
327 "link that you want to insert. The description " 330 "link that you want to insert. The description "
431 434
432 435
433 void close_smiley_dialog(GtkWidget *widget, GtkIMHtmlToolbar *toolbar) 436 void close_smiley_dialog(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
434 { 437 {
435 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->smiley), FALSE); 438 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->smiley), FALSE);
436 439
437 if (toolbar->smiley_dialog) { 440 if (toolbar->smiley_dialog) {
438 gtk_widget_destroy(toolbar->smiley_dialog); 441 gtk_widget_destroy(toolbar->smiley_dialog);
439 toolbar->smiley_dialog = NULL; 442 toolbar->smiley_dialog = NULL;
440 } 443 }
441 } 444 }
487 490
488 static void 491 static void
489 insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar) 492 insert_smiley_cb(GtkWidget *smiley, GtkIMHtmlToolbar *toolbar)
490 { 493 {
491 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(smiley))) { 494 if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(smiley))) {
492 495
493 GtkWidget *dialog; 496 GtkWidget *dialog;
494 GtkWidget *smiley_table = NULL; 497 GtkWidget *smiley_table = NULL;
495 GSList *smileys, *unique_smileys = NULL; 498 GSList *smileys, *unique_smileys = NULL;
496 int width; 499 int width;
497 int row = 0, col = 0; 500 int row = 0, col = 0;
498 501
499 if (toolbar->smiley_dialog) { 502 if (toolbar->smiley_dialog) {
500 gtk_widget_grab_focus(toolbar->imhtml); 503 gtk_widget_grab_focus(toolbar->imhtml);
501 return; 504 return;
502 } 505 }
503 506
504 /* 507 /*
505 if(c->account) 508 if(c->account)
506 smileys = get_proto_smileys( 509 smileys = get_proto_smileys(
507 gaim_account_get_protocol_id(gaim_conversation_get_account(c))); 510 gaim_account_get_protocol_id(gaim_conversation_get_account(c)));
508 else 511 else
509 */ 512 */
510 513
511 smileys = get_proto_smileys(GAIM_PROTO_DEFAULT); 514 smileys = get_proto_smileys(GAIM_PROTO_DEFAULT);
512 515
513 while(smileys) { 516 while(smileys) {
514 GtkIMHtmlSmiley *smiley = smileys->data; 517 GtkIMHtmlSmiley *smiley = smileys->data;
515 if(!smiley->hidden) { 518 if(!smiley->hidden) {
516 if(smiley_is_unique(unique_smileys, smiley)) 519 if(smiley_is_unique(unique_smileys, smiley))
517 unique_smileys = g_slist_append(unique_smileys, smiley); 520 unique_smileys = g_slist_append(unique_smileys, smiley);
518 } 521 }
519 smileys = smileys->next; 522 smileys = smileys->next;
520 } 523 }
521 524
522 525
523 width = floor(sqrt(g_slist_length(unique_smileys))); 526 width = floor(sqrt(g_slist_length(unique_smileys)));
524 527
525 GAIM_DIALOG(dialog); 528 GAIM_DIALOG(dialog);
526 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); 529 gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
527 gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog"); 530 gtk_window_set_role(GTK_WINDOW(dialog), "smiley_dialog");
528 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE); 531 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
529 532
530 smiley_table = gtk_table_new(width, width, TRUE); 533 smiley_table = gtk_table_new(width, width, TRUE);
531 534
532 /* pack buttons */ 535 /* pack buttons */
533 536
534 while(unique_smileys) { 537 while(unique_smileys) {
535 GtkIMHtmlSmiley *smiley = unique_smileys->data; 538 GtkIMHtmlSmiley *smiley = unique_smileys->data;
536 if(!smiley->hidden) { 539 if(!smiley->hidden) {
537 add_smiley(toolbar, smiley_table, row, col, smiley->file, smiley->smile); 540 add_smiley(toolbar, smiley_table, row, col, smiley->file, smiley->smile);
538 if(++col >= width) { 541 if(++col >= width) {
540 row++; 543 row++;
541 } 544 }
542 } 545 }
543 unique_smileys = unique_smileys->next; 546 unique_smileys = unique_smileys->next;
544 } 547 }
545 548
546 gtk_container_add(GTK_CONTAINER(dialog), smiley_table); 549 gtk_container_add(GTK_CONTAINER(dialog), smiley_table);
547 550
548 gtk_widget_show(smiley_table); 551 gtk_widget_show(smiley_table);
549 552
550 gtk_container_set_border_width(GTK_CONTAINER(dialog), 5); 553 gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
551 554
552 /* connect signals */ 555 /* connect signals */
553 g_object_set_data(G_OBJECT(dialog), "dialog_type", "smiley dialog"); 556 g_object_set_data(G_OBJECT(dialog), "dialog_type", "smiley dialog");
554 g_signal_connect(G_OBJECT(dialog), "delete_event", 557 g_signal_connect(G_OBJECT(dialog), "delete_event",
555 G_CALLBACK(close_smiley_dialog), toolbar); 558 G_CALLBACK(close_smiley_dialog), toolbar);
556 559
557 /* show everything */ 560 /* show everything */
558 gtk_window_set_title(GTK_WINDOW(dialog), _("Smile!")); 561 gtk_window_set_title(GTK_WINDOW(dialog), _("Smile!"));
559 gtk_widget_show_all(dialog); 562 gtk_widget_show_all(dialog);
560 563
561 toolbar->smiley_dialog = dialog; 564 toolbar->smiley_dialog = dialog;
562 565
563 } else if (toolbar->smiley_dialog) { 566 } else if (toolbar->smiley_dialog) {
564 close_smiley_dialog(smiley, toolbar); 567 close_smiley_dialog(smiley, toolbar);
565 } 568 }
566 gtk_widget_grab_focus(toolbar->imhtml); 569 gtk_widget_grab_focus(toolbar->imhtml);
567 } 570 }
754 gtk_size_group_add_widget(sg, button); 757 gtk_size_group_add_widget(sg, button);
755 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); 758 gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
756 gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert link"), NULL); 759 gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert link"), NULL);
757 g_signal_connect(G_OBJECT(button), "clicked", 760 g_signal_connect(G_OBJECT(button), "clicked",
758 G_CALLBACK(insert_link_cb), toolbar); 761 G_CALLBACK(insert_link_cb), toolbar);
759 762
760 toolbar->link = button; 763 toolbar->link = button;
761 764
762 /* Insert IM Image */ 765 /* Insert IM Image */
763 button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_IMAGE); 766 button = gaim_pixbuf_toolbar_button_from_stock(GAIM_STOCK_IMAGE);
764 gtk_size_group_add_widget(sg, button); 767 gtk_size_group_add_widget(sg, button);
813 sizeof (GtkIMHtmlToolbar), 816 sizeof (GtkIMHtmlToolbar),
814 0, 817 0,
815 (GInstanceInitFunc) gtk_imhtmltoolbar_init 818 (GInstanceInitFunc) gtk_imhtmltoolbar_init
816 }; 819 };
817 820
818 imhtmltoolbar_type = g_type_register_static(gtk_vbox_get_type(), 821 imhtmltoolbar_type = g_type_register_static(GTK_TYPE_VBOX,
819 "GtkIMHtmlToolbar", &imhtmltoolbar_info, 0); 822 "GtkIMHtmlToolbar", &imhtmltoolbar_info, 0);
820 } 823 }
821 824
822 return imhtmltoolbar_type; 825 return imhtmltoolbar_type;
823 } 826 }