[evolution/webkit: 140/182] Revert "Fix the Audio Plugin"

[Dan VrÃtil <dvratil src gnome org>]

commit 2109b674f49d247b10f1eeda47d60745ea884e78
Author: Dan VrÃtil <dvratil redhat com>
Date:   Wed Feb 8 14:49:02 2012 +0100

    Revert "Fix the Audio Plugin"
    
    This reverts commit 54911ac2d7cb8d41f1fadb847b95d8719ec456c8.

 plugins/audio-inline/audio-inline.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index dc5fce3..7250277 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -227,8 +227,6 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button,
 		}
 
 		g_free (filename);
-	} else {
-		playbin = em_part_audio_get_playbin (empa);
 	}
 
 	gst_element_get_state (playbin, &cur_state, NULL, 0);
@@ -287,10 +285,7 @@ org_gnome_audio_inline_button_panel (EMFormat *emf,
                         G_CALLBACK (org_gnome_audio_inline_stop_clicked),
                         empa, FALSE));
 
-	g_signal_connect (box, "unrealize",
-		G_CALLBACK (org_gnome_audio_inline_stop_clicked), empa);
-
-	gtk_widget_show_all (box);
+	gtk_widget_show (box);
 
 	return box;
 }
@@ -303,18 +298,15 @@ org_gnome_audio_inline_format (gpointer ep,
 	gchar *classid;
 
 	classid = g_strdup_printf (
-		"%s.org-gnome-audio-inline-button-panel-%d",
-		t->part_id->str,
+		"org-gnome-audio-inline-button-panel-%d",
 		org_gnome_audio_class_id_counter);
 
 	org_gnome_audio_class_id_counter++;
 
 	d(printf ("audio inline formatter: format classid %s\n", classid));
 
-        emp = em_part_audio_new (t->format, t->part, classid, NULL);
-        em_part_set_widget_func (emp, (EMPartWidgetFunc) org_gnome_audio_inline_button_panel);
+        emp = em_part_audio_new (t->format, t->part, t->part_id, NULL);
+        em_part_set_widget_func (emp, org_gnome_audio_inline_button_panel);
 
         em_format_add_part_object (t->format, emp);
-
-	g_free (classid);
 }