GNOME.org
 

[rygel] core,ui,dvb: Remove DVB plugin

commit 2cb5d37f13977ddde666054f313a40ff0a4051f5
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Mon Jun 15 10:57:19 2009 +0300

    core,ui,dvb: Remove DVB plugin
    
    DVB Daemon will soon be implementing D-Bus MediaServer spec.

 configure.ac                                  |    7 -
 data/rygel-preferences.ui                     |   50 +-------
 data/rygel.schemas                            |   22 ----
 src/plugins/Makefile.am                       |    5 -
 src/plugins/dvb/Makefile.am                   |   52 --------
 src/plugins/dvb/rygel-dvb-channel-group.vala  |  153 ----------------------
 src/plugins/dvb/rygel-dvb-channel.vala        |   69 ----------
 src/plugins/dvb/rygel-dvb-content-dir.vala    |   40 ------
 src/plugins/dvb/rygel-dvb-plugin-factory.vala |   76 -----------
 src/plugins/dvb/rygel-dvb-plugin.vala         |   44 -------
 src/plugins/dvb/rygel-dvb-root-container.vala |  167 -------------------------
 src/ui/rygel-preferences-dialog.vala          |    3 -
 12 files changed, 2 insertions(+), 686 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 69ae244..3a09c4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,11 +187,6 @@ AC_ARG_ENABLE(tracker-plugin,
 	[  --enable-tracker-plugin      build tracker plugin],,
         enable_tracker_plugin=yes)
 
-# Build DVB plugin
-AC_ARG_ENABLE(dvb-plugin,
-	[  --enable-dvb-plugin          build DVB plugin],,
-        enable_dvb_plugin=yes)
-
 # Build MediaExport plugin
 AC_ARG_ENABLE(media-export-plugin,
 	[  --enable-media-export-plugin          build MediaExport plugin],,
@@ -215,7 +210,6 @@ AM_CONDITIONAL([ENABLE_MAEMO], [test "x$enable_maemo" = "xyes"])
 AM_CONDITIONAL([BUILD_TEST_PLUGIN], [test "x$enable_test_plugin" = "xyes"])
 AM_CONDITIONAL([BUILD_TRACKER_PLUGIN],
                [test "x$enable_tracker_plugin" = "xyes"])
-AM_CONDITIONAL([BUILD_DVB_PLUGIN], [test "x$enable_dvb_plugin" = "xyes"])
 AM_CONDITIONAL([BUILD_MEDIATHEK_PLUGIN], [test "x$enable_mediathek_plugin" = "xyes"])
 AM_CONDITIONAL([BUILD_MEDIA_EXPORT_PLUGIN], [test "x$enable_media_export_plugin" = "xyes"])
 AM_CONDITIONAL([BUILD_EXTERNAL_PLUGIN], [test "x$enable_external_plugin" = "xyes"])
@@ -236,7 +230,6 @@ src/Makefile
 src/rygel/Makefile
 src/ui/Makefile
 src/plugins/Makefile
-src/plugins/dvb/Makefile
 src/plugins/media-export/Makefile
 src/plugins/external/Makefile
 src/plugins/mediathek/Makefile
diff --git a/data/rygel-preferences.ui b/data/rygel-preferences.ui
index aef38e9..2a973dd 100644
--- a/data/rygel-preferences.ui
+++ b/data/rygel-preferences.ui
@@ -240,7 +240,7 @@
                 <child>
                   <object class="GtkTable" id="table4">
                     <property name="visible">True</property>
-                    <property name="n_rows">10</property>
+                    <property name="n_rows">8</property>
                     <property name="n_columns">2</property>
                     <property name="column_spacing">6</property>
                     <property name="row_spacing">6</property>
@@ -327,49 +327,6 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="dvb-enabled-checkbutton">
-                        <property name="label" translatable="yes">_DVB</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="dvb-title-label">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="xpad">12</property>
-                        <property name="label" translatable="yes">Tit_le</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="dvb-title-entry">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="tooltip_text" translatable="yes">Write %u for username, %n for real name of the user and %h for host name</property>
-                        <property name="invisible_char">&#x25CF;</property>
-                        <property name="width_chars">30</property>
-                        <property name="invisible_char_set">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
-                      </packing>
-                    </child>
-                    <child>
                       <object class="GtkLabel" id="uris-label">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
@@ -523,9 +480,6 @@
                     <child>
                       <placeholder/>
                     </child>
-                    <child>
-                      <placeholder/>
-                    </child>
                   </object>
                 </child>
               </object>
@@ -599,8 +553,8 @@
     <property name="transient_for">preferences-dialog</property>
     <property name="has_separator">False</property>
     <property name="local_only">False</property>
-    <property name="action">select-folder</property>
     <property name="select_multiple">True</property>
+    <property name="action">select-folder</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>
diff --git a/data/rygel.schemas b/data/rygel.schemas
index 74763d7..05a7584 100644
--- a/data/rygel.schemas
+++ b/data/rygel.schemas
@@ -167,28 +167,6 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/rygel/DVB/enabled</key>
-        <applyto>/apps/rygel/DVB/enabled</applyto>
-        <owner>rygel</owner>
-        <type>bool</type>
-        <default>TRUE</default>
-        <locale name="C">
-          <short>Enable DVB plugin</short>
-          <long>Enable DVB plugin</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/rygel/DVB/title</key>
-        <applyto>/apps/rygel/DVB/title</applyto>
-        <owner>rygel</owner>
-        <type>string</type>
-        <default>Digital TV</default>
-        <locale name="C">
-          <short>The title of this plugin to advertise to UPnP clients.</short>
-          <long>The title of this plugin to advertise to UPnP clients.</long>
-        </locale>
-      </schema>
-      <schema>
           <key>/schemas/apps/rygel/ZDFMediathek/enabled</key>
           <applyto>/apps/rygel/ZDFMediathek/enabled</applyto>
           <owner>rygel</owner>
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 1ead891..d445987 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -6,10 +6,6 @@ if BUILD_TRACKER_PLUGIN
 TRACKER_PLUGIN = tracker
 endif
 
-if BUILD_DVB_PLUGIN
-DVB_PLUGIN = dvb
-endif
-
 if BUILD_MEDIATHEK_PLUGIN
 MEDIATHEK_PLUGIN = mediathek
 endif
@@ -24,7 +20,6 @@ endif
 
 SUBDIRS = $(TEST_PLUGIN) \
 	  $(TRACKER_PLUGIN) \
-	  $(DVB_PLUGIN) \
 	  $(MEDIATHEK_PLUGIN) \
 	  $(MEDIA_EXPORT_PLUGIN) \
 	  $(EXTERNAL_PLUGIN)
diff --git a/src/ui/rygel-preferences-dialog.vala b/src/ui/rygel-preferences-dialog.vala
index 0513f63..ddeba90 100644
--- a/src/ui/rygel-preferences-dialog.vala
+++ b/src/ui/rygel-preferences-dialog.vala
@@ -46,9 +46,6 @@ public class Rygel.PreferencesDialog : GLib.Object {
         this.sections.add (new GeneralPrefSection (this.builder, config));
         this.sections.add (new TrackerPrefSection (this.builder,
                                                    config));
-        this.sections.add (new PluginPrefSection (this.builder,
-                                                  config,
-                                                  "DVB"));
         this.sections.add (new MediaExportPrefSection (this.builder,
                                                        config));
     }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]