Make multidrag a bit more independent of Disobedience

diff --git a/disobedience/Makefile.am b/disobedience/Makefile.am
index 353b145..7935f3c 100644 (file)
--- a/disobedience/Makefile.am
+++ b/disobedience/Makefile.am
@@ -28,7 +28,7 @@ disobedience_SOURCES=disobedience.h disobedience.c client.c queue.c   \
        choose.c choose-menu.c choose-search.c popup.c misc.c           \
        control.c properties.c menu.c log.c progress.c login.c rtp.c    \
        help.c ../lib/memgc.c settings.c users.c lookup.c choose.h      \
-       popup.h playlists.c multidrag.c
+       popup.h playlists.c multidrag.c multidrag.h
 disobedience_LDADD=../lib/libdisorder.a $(LIBPCRE) $(LIBGC) $(LIBGCRYPT) \
        $(LIBASOUND) $(COREAUDIO) $(LIBDB) $(LIBICONV)
 disobedience_LDFLAGS=$(GTK_LIBS)

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 404358a..f4678c7 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -266,8 +266,6 @@ extern GtkWidget *playlists_menu;
 extern GtkWidget *editplaylists_widget;
 #endif
 
-void make_treeview_multidrag(GtkWidget *w);
-
 #endif /* DISOBEDIENCE_H */
 
 /*

diff --git a/disobedience/multidrag.c b/disobedience/multidrag.c
index 650d1c4..cc33038 100644 (file)
--- a/disobedience/multidrag.c
+++ b/disobedience/multidrag.c
@@ -35,7 +35,11 @@
  * href="http://code.google.com/p/quodlibet/">Quodlibet</a> (another software
  * jukebox, albeit as far as I can see a single-user one).
  */
-#include "disobedience.h"
+#include <config.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+
+#include "multidrag.h"
 
 static gboolean multidrag_selection_block(GtkTreeSelection attribute((unused)) *selection,
                                          GtkTreeModel attribute((unused)) *model,

diff --git a/disobedience/multidrag.h b/disobedience/multidrag.h
new file mode 100644 (file)
index 0000000..6101542
--- /dev/null
+++ b/disobedience/multidrag.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of DisOrder
+ * Copyright (C) 2009 Richard Kettlewell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/** @file disobedience/multidrag.h
+ * @brief Drag multiple rows of a GtkTreeView
+ */
+#ifndef MULTIDRAG_H
+#define MULTIDRAG_H
+
+void make_treeview_multidrag(GtkWidget *w);
+
+#endif /* MULTIDRAG_H */
+
+/*
+Local Variables:
+c-basic-offset:2
+comment-column:40
+fill-column:79
+indent-tabs-mode:nil
+End:
+*/

diff --git a/disobedience/queue-generic.c b/disobedience/queue-generic.c
index 081be81..54b11c5 100644 (file)
--- a/disobedience/queue-generic.c
+++ b/disobedience/queue-generic.c
@@ -40,6 +40,7 @@
 #include "disobedience.h"
 #include "popup.h"
 #include "queue-generic.h"
+#include "multidrag.h"
 
 static const GtkTargetEntry queuelike_targets[] = {
   {