From 23ce31d399833431fc94342995d5e7924c1feedc Mon Sep 17 00:00:00 2001
From: "Zeeshan Ali (Khattak)" <zeeshanak@gnome.org>
Date: Mon, 1 Aug 2011 22:26:49 +0300
Subject: Drop support for gupnp-ui

---
 Makefile.am                         | 21 ------------------
 configure.ac                        |  6 ------
 gupnp-ui-1.0/gupnp-ui-1.0.deps      | 11 ----------
 gupnp-ui-1.0/gupnp-ui-1.0.files     |  2 --
 gupnp-ui-1.0/gupnp-ui-1.0.gi        | 43 -------------------------------------
 gupnp-ui-1.0/gupnp-ui-1.0.metadata  |  3 ---
 gupnp-ui-1.0/gupnp-ui-1.0.namespace |  1 -
 7 files changed, 87 deletions(-)
 delete mode 100644 gupnp-ui-1.0/gupnp-ui-1.0.deps
 delete mode 100644 gupnp-ui-1.0/gupnp-ui-1.0.files
 delete mode 100644 gupnp-ui-1.0/gupnp-ui-1.0.gi
 delete mode 100644 gupnp-ui-1.0/gupnp-ui-1.0.metadata
 delete mode 100644 gupnp-ui-1.0/gupnp-ui-1.0.namespace

diff --git a/Makefile.am b/Makefile.am
index def0838..dbc139d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,12 +15,6 @@ VAPI_FILES += gupnp-1.0.vapi
 DEPS_FILES += gupnp-1.0.deps
 endif
 
-if WITH_GUPNP_UI
-STAMP_FILES += gupnp-ui-1.0.stamp
-VAPI_FILES += gupnp-ui-1.0.vapi
-DEPS_FILES += gupnp-ui-1.0.deps
-endif
-
 if WITH_GUPNP_AV
 STAMP_FILES += gupnp-av-1.0.stamp
 VAPI_FILES += gupnp-av-1.0.vapi
@@ -61,21 +55,6 @@ gupnp-1.0.stamp: gssdp-1.0.vapi
 gupnp-1.0.deps:
 	$(QUIET_GEN)cp -f gupnp-1.0/gupnp-1.0.deps $(@F)
 
-
-gupnp-ui-1.0.vapi: gupnp-ui-1.0.stamp
-	@true
-gupnp-ui-1.0.stamp: gupnp-1.0.vapi
-	$(QUIET_GEN)$(VAPIGEN) \
-		--quiet \
-		--vapidir=$(top_srcdir) \
-		--vapidir=@VAPIDIR@ \
-		--library gupnp-ui-1.0 \
-		gupnp-ui-1.0/* \
-	&& echo timestamp > $(@F)
-
-gupnp-ui-1.0.deps:
-	$(QUIET_GEN)cp -f gupnp-ui-1.0/gupnp-ui-1.0.deps $(@F)
-
 gupnp-av-1.0.vapi: gupnp-av-1.0.stamp
 	@true
 gupnp-av-1.0.stamp: gupnp-1.0.vapi
diff --git a/configure.ac b/configure.ac
index 56da6b5..ed030a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,11 +32,6 @@ PKG_CHECK_MODULES(GUPNP, [gupnp-1.0 >= 0.17.0],
                   has_gupnp=no)
 AM_CONDITIONAL(WITH_GUPNP, [test "x$has_gupnp" = "xyes"])
 
-PKG_CHECK_MODULES(GUPNP_UI, [gupnp-ui-1.0 >= 0.1.1],
-                  has_gupnp_ui=yes,
-                  has_gupnp_ui=no)
-AM_CONDITIONAL(WITH_GUPNP_UI, [test "x$has_gupnp_ui" = "xyes"])
-
 PKG_CHECK_MODULES(GUPNP_AV, [gupnp-av-1.0 >= 0.9.0],
                   has_gupnp_av=yes,
                   has_gupnp_av=no)
@@ -63,7 +58,6 @@ echo "       vapidir: ${VAPIDIR}"
 echo ""
 echo "           gssdp: yes"
 echo "           gupnp: ${has_gupnp}"
-echo "        gupnp-ui: ${has_gupnp_ui}"
 echo "        gupnp-av: ${has_gupnp_av}"
 echo "      gupnp-dlna: ${has_gupnp_dlna}"
 echo ""
diff --git a/gupnp-ui-1.0/gupnp-ui-1.0.deps b/gupnp-ui-1.0/gupnp-ui-1.0.deps
deleted file mode 100644
index 48c9a9c..0000000
--- a/gupnp-ui-1.0/gupnp-ui-1.0.deps
+++ /dev/null
@@ -1,11 +0,0 @@
-gupnp-1.0
-gssdp-1.0
-libsoup-2.4
-gio-2.0
-libxml-2.0
-gtk+-2.0
-gdk-2.0
-pango
-gdk-pixbuf-2.0
-cairo
-atk
diff --git a/gupnp-ui-1.0/gupnp-ui-1.0.files b/gupnp-ui-1.0/gupnp-ui-1.0.files
deleted file mode 100644
index 7ed9b2e..0000000
--- a/gupnp-ui-1.0/gupnp-ui-1.0.files
+++ /dev/null
@@ -1,2 +0,0 @@
-include/gupnp-ui-1.0/libgupnp-ui/*.h
-lib/libgupnp-ui-1.0.so
diff --git a/gupnp-ui-1.0/gupnp-ui-1.0.gi b/gupnp-ui-1.0/gupnp-ui-1.0.gi
deleted file mode 100644
index a6e0914..0000000
--- a/gupnp-ui-1.0/gupnp-ui-1.0.gi
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<api version="1.0">
-	<namespace name="GUPnP">
-		<enum name="GUPnPUIDeviceStoreCol">
-			<member name="GUPNP_UI_DEVICE_STORE_COL_PROXY" value="0"/>
-			<member name="GUPNP_UI_DEVICE_STORE_COL_FRIENDLY_NAME" value="1"/>
-		</enum>
-		<object name="GUPnPUIDeviceStore" parent="GtkListStore" type-name="GUPnPUIDeviceStore" get-type="gupnp_ui_device_store_get_type">
-			<implements>
-				<interface name="GtkTreeModel"/>
-				<interface name="GtkTreeDragSource"/>
-				<interface name="GtkTreeDragDest"/>
-				<interface name="GtkBuildable"/>
-				<interface name="GtkTreeSortable"/>
-			</implements>
-			<method name="get_control_point" symbol="gupnp_ui_device_store_get_control_point">
-				<return-type type="GUPnPControlPoint*"/>
-				<parameters>
-					<parameter name="store" type="GUPnPUIDeviceStore*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="gupnp_ui_device_store_new">
-				<return-type type="GUPnPUIDeviceStore*"/>
-				<parameters>
-					<parameter name="control_point" type="GUPnPControlPoint*"/>
-				</parameters>
-			</constructor>
-			<property name="control-point" type="GUPnPControlPoint*" readable="1" writable="1" construct="0" construct-only="1"/>
-		</object>
-		<object name="GUPnPUIDeviceView" parent="GtkTreeView" type-name="GUPnPUIDeviceView" get-type="gupnp_ui_device_view_get_type">
-			<implements>
-				<interface name="AtkImplementor"/>
-				<interface name="GtkBuildable"/>
-			</implements>
-			<constructor name="new" symbol="gupnp_ui_device_view_new">
-				<return-type type="GtkWidget*"/>
-				<parameters>
-					<parameter name="store" type="GUPnPUIDeviceStore*"/>
-				</parameters>
-			</constructor>
-		</object>
-	</namespace>
-</api>
diff --git a/gupnp-ui-1.0/gupnp-ui-1.0.metadata b/gupnp-ui-1.0/gupnp-ui-1.0.metadata
deleted file mode 100644
index 9ffc61b..0000000
--- a/gupnp-ui-1.0/gupnp-ui-1.0.metadata
+++ /dev/null
@@ -1,3 +0,0 @@
-GUPnP cheader_filename="libgupnp-ui/gupnp-ui.h" lower_case_cprefix="gupnp_"
-
-gupnp_ui_device_store_get_control_point hidden="1"
diff --git a/gupnp-ui-1.0/gupnp-ui-1.0.namespace b/gupnp-ui-1.0/gupnp-ui-1.0.namespace
deleted file mode 100644
index 2cf5dff..0000000
--- a/gupnp-ui-1.0/gupnp-ui-1.0.namespace
+++ /dev/null
@@ -1 +0,0 @@
-GUPnP
-- 
cgit v1.2.1