Mercurial > pidgin.yaz
changeset 4041:3a36ec242415
[gaim-migrate @ 4249]
Michael Golden replaced a deprecated gtk call, and I fixed a leak in
gtkimhtmlc.
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Tue, 03 Dec 2002 22:26:54 +0000 |
| parents | 89b56ab2b692 |
| children | a3ec0146c73e |
| files | src/conversation.c src/gtkimhtml.c |
| diffstat | 2 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Tue Dec 03 17:50:43 2002 +0000 +++ b/src/conversation.c Tue Dec 03 22:26:54 2002 +0000 @@ -2147,7 +2147,7 @@ GtkBox *box = GTK_BOX(c->text->parent->parent); c->progress = gtk_progress_bar_new(); gtk_box_pack_end(box, c->progress, FALSE, FALSE, 0); - gtk_widget_set_usize (c->progress, 1, 8); + gtk_widget_set_size_request (c->progress, 1, 8); gtk_widget_show (c->progress); } @@ -2926,7 +2926,7 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(sw), GTK_SHADOW_IN); gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0); - gtk_widget_set_usize(sw, conv_size.width, conv_size.height); + gtk_widget_set_size_request(sw, conv_size.width, conv_size.height); gtk_widget_show(sw); text = gtk_imhtml_new(NULL, NULL); @@ -2974,8 +2974,8 @@ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(c->entry), GTK_WRAP_WORD); - gtk_widget_set_usize(entry, conv_size.width - 20, MAX(conv_size.entry_height, 25)); - + gtk_widget_set_size_request(entry, conv_size.width - 20, MAX(conv_size.entry_height, 25)); + g_signal_connect_swapped(G_OBJECT(c->entry), "key_press_event", G_CALLBACK(entry_key_pressed), c->entry_buffer); g_signal_connect(G_OBJECT(c->entry), "key_press_event", G_CALLBACK(keypress_callback), c); @@ -3762,7 +3762,7 @@ gtk_widget_show(event); c->icon = gtk_pixmap_new(pm, bm); - gtk_widget_set_usize(c->icon, sf, sf); + gtk_widget_set_size_request(c->icon, sf, sf); gtk_container_add(GTK_CONTAINER(event), c->icon); gtk_widget_show(c->icon); if(im_options & OPT_IM_NO_ANIMATION)
--- a/src/gtkimhtml.c Tue Dec 03 17:50:43 2002 +0000 +++ b/src/gtkimhtml.c Tue Dec 03 22:26:54 2002 +0000 @@ -96,7 +96,8 @@ t->image = path; } -gtk_smiley_tree_destroy (GtkSmileyTree *tree) + +gboolean gtk_smiley_tree_destroy (GtkSmileyTree *tree) { GSList *list = g_slist_append (NULL, tree); @@ -112,6 +113,7 @@ } g_free (t); } + return TRUE; } static GtkTextViewClass *parent_class = NULL;