pidgin.vv: 4a5cb680: Improve the padding around the mute butt...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 4a5cb68024a5d8178b438039f3bb86a724828598
Ancestor: 1daa4b74ac65cce54a850ac62dc64bc0e414ef45
Author: maiku at soc.pidgin.im
Date: 2009-04-03T03:14:38
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/4a5cb68024a5d8178b438039f3bb86a724828598

Modified files:
        pidgin/gtkmedia.c

ChangeLog: 

Improve the padding around the mute button.

-------------- next part --------------
============================================================
--- pidgin/gtkmedia.c	e247f6fae274ee39507981fea9597396d91e83ba
+++ pidgin/gtkmedia.c	e4186f27a61b5352d8c00a7b7dce056a8b74b245
@@ -301,7 +301,7 @@ pidgin_media_init (PidginMedia *media)
 static void
 pidgin_media_init (PidginMedia *media)
 {
-	GtkWidget *vbox, *hbox;
+	GtkWidget *vbox;
 	media->priv = PIDGIN_MEDIA_GET_PRIVATE(media);
 
 	XSetErrorHandler(pidgin_x_error_handler);
@@ -320,19 +320,6 @@ pidgin_media_init (PidginMedia *media)
 	gtk_box_pack_start(GTK_BOX(vbox), media->priv->menubar,
 			FALSE, TRUE, 0);
 
-	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-	gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(GTK_WIDGET(hbox));
-
-	media->priv->mute = gtk_toggle_button_new_with_mnemonic("_Mute");
-
-	g_signal_connect(media->priv->mute, "toggled",
-			G_CALLBACK(pidgin_media_mute_toggled), media);
-
-	gtk_box_pack_end(GTK_BOX(hbox), media->priv->mute, FALSE, FALSE, 0);
-	gtk_container_set_border_width(GTK_CONTAINER(media->priv->mute),
-			PIDGIN_HIG_BOX_SPACE);
-
 	media->priv->display = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 	gtk_container_set_border_width(GTK_CONTAINER(media->priv->display),
 			PIDGIN_HIG_BOX_SPACE);
@@ -734,7 +721,21 @@ pidgin_media_ready_cb(PurpleMedia *media
 	}
 	if (type & PURPLE_MEDIA_SEND_AUDIO) {
 		GstElement *media_src;
-		GtkWidget *volume = gtk_hscale_new_with_range(0.0, 100.0, 5.0);
+		GtkWidget *hbox, *volume;
+
+		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+		gtk_box_pack_end(GTK_BOX(send_widget), hbox, FALSE, FALSE, 0);
+		gtkmedia->priv->mute =
+				gtk_toggle_button_new_with_mnemonic("_Mute");
+		g_signal_connect(gtkmedia->priv->mute, "toggled",
+				G_CALLBACK(pidgin_media_mute_toggled),
+				gtkmedia);
+		gtk_box_pack_end(GTK_BOX(hbox), gtkmedia->priv->mute,
+				FALSE, FALSE, 0);
+		gtk_widget_show(gtkmedia->priv->mute);
+		gtk_widget_show(GTK_WIDGET(hbox));
+
+		volume = gtk_hscale_new_with_range(0.0, 100.0, 5.0);
 		gtk_range_set_increments(GTK_RANGE(volume), 5.0, 25.0);
 		gtk_range_set_value(GTK_RANGE(volume),
 				purple_prefs_get_int(