evolution-rss r151 - trunk/src

[lucilanga svn gnome org]

Author: lucilanga
Date: Fri Feb  8 06:30:35 2008
New Revision: 151
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=151&view=rev

Log:
remove rss component

Modified:
   trunk/src/GNOME_Evolution_RSS.server.in.in
   trunk/src/rss.c
   trunk/src/rss.h

Modified: trunk/src/GNOME_Evolution_RSS.server.in.in
==============================================================================
--- trunk/src/GNOME_Evolution_RSS.server.in.in	(original)
+++ trunk/src/GNOME_Evolution_RSS.server.in.in	Fri Feb  8 06:30:35 2008
@@ -11,33 +11,6 @@
 	<oaf_attribute name="name" type="string"
                        _value="Evolution RSS Reader"/>
 
-</oaf_server>
-	
-	<oaf_server iid="OAFIID:GNOME_Evolution_RSS_Component:@VERSION@"
-                type="factory"
-                location="OAFIID:GNOME_Evolution_RSS_Factory:@VERSION@">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-            <item value="IDL:GNOME/Evolution/Component:@VERSION@"/>
-        </oaf_attribute>
-
-        <oaf_attribute name="name" type="string"
-                       _value="Evolution RSS Reader"/>
-
-        <oaf_attribute name="evolution:component_alias" type="string"
-                       value="evolution-rss"/>
-
-        <oaf_attribute name="evolution:button_label" type="string"
-                       _value="RSS"/>
-        <oaf_attribute name="evolution:button_icon" type="string"
-                       value="@ICON_DIR@/rss.png"/>
-        <oaf_attribute name="evolution:button_sort_order" type="string"
-                       value="10"/>
-
-        <oaf_attribute name="evolution:menu_label" type="string" _value="_News"/>
-        <oaf_attribute name="evolution:menu_accelerator" type="string" _value="*Control*F10"/>
-    </oaf_server>
-
 <oaf_server iid="OAFIID:GNOME_Evolution_RSS:@VERSION@"
             type="factory"
             location="OAFIID:GNOME_Evolution_RSS_Factory:@VERSION@">

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Fri Feb  8 06:30:35 2008
@@ -111,17 +111,6 @@
 //#define RSS_DEBUG 1
 #define d(x)
 
-#include <bonobo/bonobo-control.h>
-#include <bonobo/bonobo-exception.h>
-#include <e-util/e-dialog-utils.h>
-#include <libgnome/gnome-i18n.h>
-#include <libgnome/gnome-util.h>
-#include <libsoup/soup-session-async.h>
-#include <shell/evolution-shell-component-utils.h>
-
-
-#include "src/rss-component.c"
-
 #define DEFAULT_FEEDS_FOLDER "News&Blogs"
 #define DEFAULT_NO_CHANNEL "Untitled channel"
 
@@ -164,7 +153,6 @@
 
 #define RSS_CONTROL_ID  "OAFIID:GNOME_Evolution_RSS:" EVOLUTION_VERSION_STRING
 #define FACTORY_ID      "OAFIID:GNOME_Evolution_RSS_Factory:" EVOLUTION_VERSION_STRING
-#define COMPONENT_ID	"OAFIID:GNOME_Evolution_RSS_Component:" EVOLUTION_VERSION_STRING
 
 guint           upgrade = 0;                // set to 2 when initailization successfull
 
@@ -6076,13 +6064,6 @@
        if (strcmp (component_id, RSS_CONTROL_ID) == 0)
              return BONOBO_OBJECT (rss_config_control_new ());
 
-        if (strcmp (component_id, COMPONENT_ID) == 0)
-	{
-		BonoboObject *object = BONOBO_OBJECT (g_object_new (RSS_TYPE_COMPONENT, NULL));
-                bonobo_object_ref (object);
-                return object;
-	}
-
         g_warning (FACTORY_ID ": Don't know what to do with %s", component_id);
         return NULL;
 }

Modified: trunk/src/rss.h
==============================================================================
--- trunk/src/rss.h	(original)
+++ trunk/src/rss.h	Fri Feb  8 06:30:35 2008
@@ -24,8 +24,6 @@
 #ifndef __RSS_H_
 #define __RSS_H_
 
-#include "src/rss-component.h"
-
 #define PLUGIN_INSTALL_DIR @PLUGIN_INSTALL_DIR@
 
 GConfClient *rss_gconf;