# HG changeset patch # User Ethan Blanton # Date 1180049825 0 # Node ID baaf2cf9339c1b300090eff7411a75a75026dc9e # Parent 9c7abb947af4ae8fb280ed2194dc5cd46e5338b9 disapproval of revision '1f819f5ad330efa81ac7906f854b46f0c8bbd7b6' diff -r 9c7abb947af4 -r baaf2cf9339c pidgin/gtkconv.c --- a/pidgin/gtkconv.c Thu May 24 00:35:15 2007 +0000 +++ b/pidgin/gtkconv.c Thu May 24 23:37:05 2007 +0000 @@ -4207,6 +4207,9 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), imhtml_sw_hscroll, GTK_POLICY_ALWAYS); + gtk_widget_set_size_request(gtkconv->imhtml, + purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_width"), + purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_height")); g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv); @@ -4383,6 +4386,9 @@ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(imhtml_sw), imhtml_sw_hscroll, GTK_POLICY_ALWAYS); + gtk_widget_set_size_request(gtkconv->imhtml, + purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"), + purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height")); g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv); @@ -8040,9 +8046,8 @@ gtk_window_set_role(GTK_WINDOW(win->window), "conversation"); gtk_window_set_resizable(GTK_WINDOW(win->window), TRUE); gtk_container_set_border_width(GTK_CONTAINER(win->window), 0); - gtk_window_set_default_size(win->window, - purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"), - purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height")); + GTK_WINDOW(win->window)->allow_shrink = TRUE; + if (available_list == NULL) { create_icon_lists(win->window); } diff -r 9c7abb947af4 -r baaf2cf9339c pidgin/gtkimhtmltoolbar.c --- a/pidgin/gtkimhtmltoolbar.c Thu May 24 00:35:15 2007 +0000 +++ b/pidgin/gtkimhtmltoolbar.c Thu May 24 23:37:05 2007 +0000 @@ -899,10 +899,7 @@ { GtkWidget *hbox = GTK_WIDGET(toolbar); GtkWidget *button; - GtkWidget *bbox; - GtkWidget *label; GtkWidget *sep; - GtkWidget *image; GtkSizeGroup *sg; toolbar->imhtml = NULL; @@ -915,7 +912,7 @@ toolbar->tooltips = gtk_tooltips_new(); - gtk_box_set_spacing(GTK_BOX(toolbar), 0); + gtk_box_set_spacing(GTK_BOX(toolbar), 3); sg = gtk_size_group_new(GTK_SIZE_GROUP_BOTH); /* Bold */ @@ -984,16 +981,12 @@ gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); /* Font Face */ - button = gtk_toggle_button_new(); - gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); - bbox = gtk_hbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(button), bbox); - image = gtk_image_new_from_stock(GTK_STOCK_BOLD, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); - gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0); - label = gtk_label_new(_("Font")); - gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0); + + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_FONT_FACE); + gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); - gtk_widget_show_all(button); + gtk_tooltips_set_tip(toolbar->tooltips, button, + _("Font face"), NULL); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(toggle_font), toolbar); @@ -1027,20 +1020,13 @@ /* Sep */ sep = gtk_vseparator_new(); gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); - gtk_widget_show(sep); - /* Reset formatting */ - button = gtk_toggle_button_new(); - gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); - bbox = gtk_hbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(button), bbox); - image = gtk_image_new_from_stock(PIDGIN_STOCK_CLEAR, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); - gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0); - label = gtk_label_new(_("Reset font")); - gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0); + /* Reset Formatting */ + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_CLEAR); + gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); - gtk_widget_show_all(button); - + gtk_tooltips_set_tip(toolbar->tooltips, button, + _("Reset formatting"), NULL); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(clear_formatting_cb), toolbar); @@ -1050,7 +1036,6 @@ /* Sep */ sep = gtk_vseparator_new(); gtk_box_pack_start(GTK_BOX(hbox), sep, FALSE, FALSE, 0); - gtk_widget_show(sep); /* Insert Link */ button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_INSERT_LINK); @@ -1074,16 +1059,10 @@ toolbar->image = button; /* Insert Smiley */ - button = gtk_toggle_button_new(); - gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE); - bbox = gtk_hbox_new(FALSE, 3); - gtk_container_add(GTK_CONTAINER(button), bbox); - image = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_INSERT, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); - gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0); - label = gtk_label_new(_("Insert")); - gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0); + button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_SMILEY); + gtk_size_group_add_widget(sg, button); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); - gtk_widget_show_all(button); + gtk_tooltips_set_tip(toolbar->tooltips, button, _("Insert smiley"), NULL); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(insert_smiley_cb), toolbar); @@ -1091,7 +1070,7 @@ toolbar->smiley = button; toolbar->sml = NULL; - gtk_widget_show(hbox); + gtk_widget_show_all(hbox); } GtkWidget *gtk_imhtmltoolbar_new() diff -r 9c7abb947af4 -r baaf2cf9339c pidgin/pidginstock.c --- a/pidgin/pidginstock.c Thu May 24 00:35:15 2007 +0000 +++ b/pidgin/pidginstock.c Thu May 24 23:37:05 2007 +0000 @@ -160,7 +160,6 @@ { PIDGIN_STOCK_TOOLBAR_UNBLOCK, "toolbar", "unblock.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "toolbar", "select-avatar.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TOOLBAR_SEND_FILE, "toolbar", "send-file.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, - { PIDGIN_STOCK_TOOLBAR_INSERT, "toolbar", "insert.png", TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TRAY_AVAILABLE, "tray", "tray-online.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL }, { PIDGIN_STOCK_TRAY_INVISIBLE, "tray", "tray-invisible.png", TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, NULL }, diff -r 9c7abb947af4 -r baaf2cf9339c pidgin/pidginstock.h --- a/pidgin/pidginstock.h Thu May 24 00:35:15 2007 +0000 +++ b/pidgin/pidginstock.h Thu May 24 23:37:05 2007 +0000 @@ -125,7 +125,6 @@ #define PIDGIN_STOCK_TOOLBAR_UNBLOCK "pidgin-unblock" #define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar" #define PIDGIN_STOCK_TOOLBAR_SEND_FILE "pidgin-send-file" -#define PIDGIN_STOCK_TOOLBAR_INSERT "pidgin-insert" /* Tray icons */ #define PIDGIN_STOCK_TRAY_AVAILABLE "pidgin-tray-available" diff -r 9c7abb947af4 -r baaf2cf9339c pidgin/pixmaps/toolbar/16/Makefile.am --- a/pidgin/pixmaps/toolbar/16/Makefile.am Thu May 24 00:35:15 2007 +0000 +++ b/pidgin/pixmaps/toolbar/16/Makefile.am Thu May 24 23:37:05 2007 +0000 @@ -6,7 +6,6 @@ font-face.png \ font-size-down.png \ font-size-up.png \ - insert.png \ insert-image.png \ insert-link.png \ message-new.png \ diff -r 9c7abb947af4 -r baaf2cf9339c pidgin/pixmaps/toolbar/16/insert.png Binary file pidgin/pixmaps/toolbar/16/insert.png has changed diff -r 9c7abb947af4 -r baaf2cf9339c pidgin/pixmaps/toolbar/16/scalable/Makefile.am --- a/pidgin/pixmaps/toolbar/16/scalable/Makefile.am Thu May 24 00:35:15 2007 +0000 +++ b/pidgin/pixmaps/toolbar/16/scalable/Makefile.am Thu May 24 23:37:05 2007 +0000 @@ -2,5 +2,4 @@ change-fgcolor.svg \ emote-select.svg \ font-size-down.svg \ - font-size-up.svg \ - insert.svg + font-size-up.svg diff -r 9c7abb947af4 -r baaf2cf9339c pidgin/pixmaps/toolbar/16/scalable/insert.svg --- a/pidgin/pixmaps/toolbar/16/scalable/insert.svg Thu May 24 00:35:15 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - -