comparison: pidgin/gtkimhtmltoolbar.c
pidgin/gtkimhtmltoolbar.c
- changeset 15562
- 8c8249fe5e3c
- parent 15435
- 4b933b06d75e
- child 15568
- cd19bb5a51b8
equal
deleted
inserted
replaced
| 15561:bdb019a1f485 | 15562:8c8249fe5e3c |
|---|---|
| 457 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE); | 457 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE); |
| 458 return; | 458 return; |
| 459 } | 459 } |
| 460 | 460 |
| 461 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ | 461 #if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */ |
| 462 if (gaim_gtk_check_if_dir(filename, GTK_FILE_SELECTION(widget))) { | 462 if (pidgin_check_if_dir(filename, GTK_FILE_SELECTION(widget))) { |
| 463 g_free(filename); | 463 g_free(filename); |
| 464 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE); | 464 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE); |
| 465 return; | 465 return; |
| 466 } | 466 } |
| 467 #endif /* FILECHOOSER */ | 467 #endif /* FILECHOOSER */ |
| 651 gtk_widget_grab_focus(toolbar->imhtml); | 651 gtk_widget_grab_focus(toolbar->imhtml); |
| 652 return; | 652 return; |
| 653 } | 653 } |
| 654 | 654 |
| 655 if (toolbar->sml) | 655 if (toolbar->sml) |
| 656 smileys = gaim_gtkthemes_get_proto_smileys(toolbar->sml); | 656 smileys = pidginthemes_get_proto_smileys(toolbar->sml); |
| 657 else | 657 else |
| 658 smileys = gaim_gtkthemes_get_proto_smileys(NULL); | 658 smileys = pidginthemes_get_proto_smileys(NULL); |
| 659 | 659 |
| 660 while(smileys) { | 660 while(smileys) { |
| 661 GtkIMHtmlSmiley *smiley = smileys->data; | 661 GtkIMHtmlSmiley *smiley = smileys->data; |
| 662 if(!smiley->hidden) { | 662 if(!smiley->hidden) { |
| 663 if(smiley_is_unique(unique_smileys, smiley)) | 663 if(smiley_is_unique(unique_smileys, smiley)) |
