[rhythmbox] daap: remove gtk_dialog_run usage
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] daap: remove gtk_dialog_run usage
- Date: Wed, 8 Feb 2012 12:51:37 +0000 (UTC)
commit 6b3040476401d7ce49ff05a3e0d9e16b97e136fd
Author: Jonathan Matthew <jonathan d14n org>
Date: Wed Feb 8 22:51:20 2012 +1000
daap: remove gtk_dialog_run usage
plugins/daap/Makefile.am | 2 -
plugins/daap/rb-daap-dialog.c | 100 -----------------------------------------
plugins/daap/rb-daap-dialog.h | 42 -----------------
plugins/daap/rb-daap-plugin.c | 10 +++-
plugins/daap/rb-daap-source.c | 1 -
5 files changed, 8 insertions(+), 147 deletions(-)
---
diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
index a720961..e82870a 100644
--- a/plugins/daap/Makefile.am
+++ b/plugins/daap/Makefile.am
@@ -21,8 +21,6 @@ libdaap_la_SOURCES = \
rb-daap-src.h \
rb-dmap-container-db-adapter.c \
rb-dmap-container-db-adapter.h \
- rb-daap-dialog.c \
- rb-daap-dialog.h \
rb-dacp-pairing-page.c \
rb-dacp-pairing-page.h \
rb-dacp-player.c \
diff --git a/plugins/daap/rb-daap-plugin.c b/plugins/daap/rb-daap-plugin.c
index 880c840..0b45b11 100644
--- a/plugins/daap/rb-daap-plugin.c
+++ b/plugins/daap/rb-daap-plugin.c
@@ -665,6 +665,12 @@ new_daap_share_location_added_cb (RBURIDialog *dialog,
}
static void
+new_daap_share_response_cb (GtkDialog *dialog, int response, gpointer meh)
+{
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+static void
rb_daap_plugin_cmd_connect (GtkAction *action,
RBDaapPlugin *plugin)
{
@@ -674,8 +680,8 @@ rb_daap_plugin_cmd_connect (GtkAction *action,
g_signal_connect_object (dialog, "location-added",
G_CALLBACK (new_daap_share_location_added_cb),
plugin, 0);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
+ gtk_widget_show_all (dialog);
+ g_signal_connect (dialog, "response", G_CALLBACK (new_daap_share_response_cb), NULL);
}
diff --git a/plugins/daap/rb-daap-source.c b/plugins/daap/rb-daap-source.c
index f4c1de7..351bdc0 100644
--- a/plugins/daap/rb-daap-source.c
+++ b/plugins/daap/rb-daap-source.c
@@ -52,7 +52,6 @@
#include "rb-rhythmdb-dmap-db-adapter.h"
#include "rb-display-page.h"
-#include "rb-daap-dialog.h"
#include "rb-daap-plugin.h"
#include "rb-static-playlist-source.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]