im.pidgin.pidgin.vv: a1042e49473f4c824a95051f617307e545a80bda

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: a1042e49473f4c824a95051f617307e545a80bda
Ancestor: bd277fc8667e1c46da4b48948dac2d681265f196
Author: sadrul at pidgin.im
Date: 2007-12-29T17:06:59
Branch: im.pidgin.pidgin.vv

Modified files:
        pidgin/gtkconv.c pidgin/gtkmedia.c

ChangeLog: 

Remove a compile error, and a few warnings.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	70be263b3417e3dfec6beee1dc13bfa2efb91470
+++ pidgin/gtkconv.c	76d356fc5832cdb78a1a2b756789b66717060d14
@@ -4601,7 +4601,6 @@ setup_common_pane(PidginConversation *gt
 
 	/* Setup the top part of the pane */
 	gtkconv->topvbox = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-	gtk_paned_pack1(GTK_PANED(paned), vbox, TRUE, TRUE);
 	gtk_widget_show(vbox);
 
 	/* Setup the info pane */
============================================================
--- pidgin/gtkmedia.c	393aa7aade2dc94adf4cc1512ab54fb300bea41a
+++ pidgin/gtkmedia.c	140b19f4132115121f428058e48f417bdfda2fea
@@ -88,7 +88,8 @@ pidgin_media_get_type()
 			NULL,
 			sizeof(PidginMedia),
 			0,
-			(GInstanceInitFunc) pidgin_media_init
+			(GInstanceInitFunc) pidgin_media_init,
+			NULL
 		};
 		type = g_type_register_static(GTK_TYPE_HBOX, "PidginMedia", &info, 0);
 	}
@@ -202,9 +203,9 @@ level_message_cb(GstBus *bus, GstMessage
 	rms_db = g_value_get_double(value);
 
 	if (!strcmp(gst_element_get_name(src), "sendlevel"))	
-		gtk_progress_bar_set_fraction(gtkmedia->priv->send_progress, pow(10, rms_db / 20) * 5);
+		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(gtkmedia->priv->send_progress), pow(10, rms_db / 20) * 5);
 	else
-		gtk_progress_bar_set_fraction(gtkmedia->priv->recv_progress, pow(10, rms_db / 20) * 5);
+		gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(gtkmedia->priv->recv_progress), pow(10, rms_db / 20) * 5);
 
 	return TRUE;
 }
@@ -213,9 +214,9 @@ pidgin_media_ready_cb(PurpleMedia *media
 pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia)
 {
 	GstElement *element = purple_media_get_audio_pipeline(media);
-	gst_bus_add_signal_watch(gst_pipeline_get_bus(element));
-	g_signal_connect(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))), "message", level_message_cb, gtkmedia);
-	printf("\n\nbus: %d\n", gst_pipeline_get_bus(GST_PIPELINE(element)));
+	gst_bus_add_signal_watch(GST_BUS(gst_pipeline_get_bus(GST_PIPELINE(element))));
+	g_signal_connect(G_OBJECT(gst_pipeline_get_bus(GST_PIPELINE(element))), "message", G_CALLBACK(level_message_cb), gtkmedia);
+	printf("\n\nbus: %p\n", gst_pipeline_get_bus(GST_PIPELINE(element)));
 }
 
 static void
@@ -231,14 +232,14 @@ pidgin_media_hangup_cb(PurpleMedia *medi
 pidgin_media_hangup_cb(PurpleMedia *media, PidginMedia *gtkmedia)
 {
 	pidgin_media_emit_message(gtkmedia, _("You have ended the call."));
-	gtk_widget_destroy(gtkmedia);
+	gtk_widget_destroy(GTK_WIDGET(gtkmedia));
 }
 
 static void
 pidgin_media_reject_cb(PurpleMedia *media, PidginMedia *gtkmedia)
 {
 	pidgin_media_emit_message(gtkmedia, _("You have rejected the call."));
-	gtk_widget_destroy(gtkmedia);
+	gtk_widget_destroy(GTK_WIDGET(gtkmedia));
 }
 
 static void