Mercurial > pidgin.yaz
changeset 26131:6eeb500ce9a2
Remove unneeded pidgin_media_get_display_widget function.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 14 Jan 2009 09:32:48 +0000 |
| parents | 525aa65805b9 |
| children | ae3d25465d0f |
| files | pidgin/gtkconv.c pidgin/gtkmedia.c pidgin/gtkmedia.h |
| diffstat | 3 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkconv.c Wed Jan 14 09:20:07 2009 +0000 +++ b/pidgin/gtkconv.c Wed Jan 14 09:32:48 2009 +0000 @@ -7836,10 +7836,6 @@ g_signal_connect(G_OBJECT(gtkmedia), "destroy", G_CALLBACK( pidgin_conv_gtkmedia_destroyed), gtkconv); - gtk_box_pack_start(GTK_BOX(gtkmedia), - pidgin_media_get_display_widget(gtkmedia), - TRUE, TRUE, PIDGIN_HIG_BOX_SPACE); - pidgin_conv_update_buttons_by_protocol(conv); return TRUE; }
--- a/pidgin/gtkmedia.c Wed Jan 14 09:20:07 2009 +0000 +++ b/pidgin/gtkmedia.c Wed Jan 14 09:32:48 2009 +0000 @@ -205,6 +205,8 @@ gtk_widget_show_all(media->priv->reject); media->priv->display = gtk_vbox_new(TRUE, PIDGIN_HIG_BOX_SPACE); + gtk_box_pack_start(GTK_BOX(media), media->priv->display, + TRUE, TRUE, PIDGIN_HIG_BOX_SPACE); } static gboolean @@ -304,7 +306,7 @@ static void pidgin_media_finalize(GObject *media) { - PidginMedia *gtkmedia = PIDGIN_MEDIA(media); + /* PidginMedia *gtkmedia = PIDGIN_MEDIA(media); */ purple_debug_info("gtkmedia", "pidgin_media_finalize\n"); G_OBJECT_CLASS(parent_class)->finalize(media); @@ -316,12 +318,6 @@ g_signal_emit(gtkmedia, pidgin_media_signals[MESSAGE], 0, msg); } -GtkWidget * -pidgin_media_get_display_widget(GtkWidget *gtkmedia) -{ - return PIDGIN_MEDIA_GET_PRIVATE(gtkmedia)->display; -} - static gboolean create_window (GstBus *bus, GstMessage *message, PidginMedia *gtkmedia) {
--- a/pidgin/gtkmedia.h Wed Jan 14 09:20:07 2009 +0000 +++ b/pidgin/gtkmedia.h Wed Jan 14 09:32:48 2009 +0000 @@ -60,7 +60,6 @@ GType pidgin_media_get_type(void); GtkWidget *pidgin_media_new(PurpleMedia *media, const gchar *screenname); -GtkWidget *pidgin_media_get_display_widget(GtkWidget *gtkmedia); G_END_DECLS