disapproval of revision '6e8f285962e77199bf88dfc8d2a08386beb02634'seanegan.convwindow

8 files changed, 24 insertions, 179 deletions

diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 4a8c3d9690..c07f3ea4d6 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -4207,6 +4207,9 @@ setup_chat_pane(PidginConversation *gtkconv)
 	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 @@ setup_im_pane(PidginConversation *gtkconv)
 	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 @@ pidgin_conv_window_new()
 	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 --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index dd236b2180..67b2c1c7ed 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -899,10 +899,7 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 {
 	GtkWidget *hbox = GTK_WIDGET(toolbar);
 	GtkWidget *button;
-	GtkWidget *bbox;
-	GtkWidget *label;
 	GtkWidget *sep;
-	GtkWidget *image;
 	GtkSizeGroup *sg;
 
 	toolbar->imhtml = NULL;
@@ -915,7 +912,7 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 
 	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 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	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 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	/* 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 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	/* 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 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	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 @@ static void gtk_imhtmltoolbar_init (GtkIMHtmlToolbar *toolbar)
 	toolbar->smiley = button;
 
 	toolbar->sml = NULL;
-	gtk_widget_show(hbox);
+	gtk_widget_show_all(hbox);
 }
 
 GtkWidget *gtk_imhtmltoolbar_new()
diff --git a/pidgin/pidginstock.c b/pidgin/pidginstock.c
index 5948a0b4fd..91d9794b59 100644
--- a/pidgin/pidginstock.c
+++ b/pidgin/pidginstock.c
@@ -160,7 +160,6 @@ static struct SizedStockIcon {
 	{ 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 --git a/pidgin/pidginstock.h b/pidgin/pidginstock.h
index fdb36733ac..83a886f24c 100644
--- a/pidgin/pidginstock.h
+++ b/pidgin/pidginstock.h
@@ -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 --git a/pidgin/pixmaps/toolbar/16/Makefile.am b/pidgin/pixmaps/toolbar/16/Makefile.am
index cf7269c30d..e478efcb71 100644
--- a/pidgin/pixmaps/toolbar/16/Makefile.am
+++ b/pidgin/pixmaps/toolbar/16/Makefile.am
@@ -6,7 +6,6 @@ EXTRA_DIST = change-bgcolor.png \
 		font-face.png \
 		font-size-down.png \
 		font-size-up.png \
-		insert.png \
 		insert-image.png \
 		insert-link.png \
 		message-new.png \
diff --git a/pidgin/pixmaps/toolbar/16/insert.png b/pidgin/pixmaps/toolbar/16/insert.png
deleted file mode 100644
index 43027ba9c2..0000000000
--- a/pidgin/pixmaps/toolbar/16/insert.png
+++ /dev/null
diff --git a/pidgin/pixmaps/toolbar/16/scalable/Makefile.am b/pidgin/pixmaps/toolbar/16/scalable/Makefile.am
index f2aefc56e1..883b31de13 100644
--- a/pidgin/pixmaps/toolbar/16/scalable/Makefile.am
+++ b/pidgin/pixmaps/toolbar/16/scalable/Makefile.am
@@ -2,5 +2,4 @@ EXTRA_DIST = change-bgcolor.svg \
 		change-fgcolor.svg \
 		emote-select.svg \
 		font-size-down.svg \
-		font-size-up.svg \
-		insert.svg
+		font-size-up.svg
diff --git a/pidgin/pixmaps/toolbar/16/scalable/insert.svg b/pidgin/pixmaps/toolbar/16/scalable/insert.svg
deleted file mode 100644
index 69ad5b8f2e..0000000000
--- a/pidgin/pixmaps/toolbar/16/scalable/insert.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg1872"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   inkscape:export-filename="/home/hbons/Desktop/insert-all.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:docbase="/home/hbons/Desktop"
-   sodipodi:docname="insert-all.svg">
-  <defs
-     id="defs1874">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2802">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2804" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2806" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2783">
-      <stop
-         style="stop-color:white;stop-opacity:1;"
-         offset="0"
-         id="stop2785" />
-      <stop
-         style="stop-color:white;stop-opacity:0;"
-         offset="1"
-         id="stop2787" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2783"
-       id="linearGradient2789"
-       x1="8.6048269"
-       y1="4.077672"
-       x2="8.6048269"
-       y2="8.9015455"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2783"
-       id="linearGradient2794"
-       gradientUnits="userSpaceOnUse"
-       x1="8.6048269"
-       y1="4.077672"
-       x2="8.6048269"
-       y2="8.9015455"
-       gradientTransform="matrix(1,0,0,0.974001,0.153466,2.116996)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2802"
-       id="linearGradient2808"
-       x1="9.5280094"
-       y1="11.860396"
-       x2="-0.20531939"
-       y2="11.860396"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.974001,0.153466,-0.805007)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="9.6217822"
-     inkscape:cy="7.0539604"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1440"
-     inkscape:window-height="849"
-     inkscape:window-x="0"
-     inkscape:window-y="0" />
-  <metadata
-     id="metadata1877">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <image
-       y="-18.531683"
-       x="-33.423763"
-       id="image1887"
-       height="31"
-       width="29"
-       sodipodi:absref="/home/hbons/Desktop/Screenshot-2.png"
-       xlink:href="Screenshot-2.png" />
-    <path
-       style="fill:#fcaf3e;fill-opacity:1;stroke:#c05400;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 0.18515042,6.5000001 L 15.653466,6.5000001 L 8.168182,14.841153 L 0.18515042,6.5000001 z "
-       id="rect1890"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="opacity:0.49431817;fill:url(#linearGradient2794);fill-opacity:1;stroke:white;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1"
-       d="M 2.5909654,7.474001 L 8.1534654,13.56705 L 13.372216,7.474001 L 2.5909654,7.474001 z "
-       id="path2781"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="opacity:0.18181817;fill:url(#linearGradient2808);fill-opacity:1;stroke:none;stroke-width:0.99999988;stroke-miterlimit:4;stroke-opacity:1"
-       d="M -1,6.0655571 L 8.2096212,15.428502 L 8.2069307,6.0655571 L -1,6.0655571 z "
-       id="path2798"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>