evolution-rss r150 - trunk/src

[lucilanga svn gnome org]

Author: lucilanga
Date: Thu Feb  7 15:58:42 2008
New Revision: 150
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=150&view=rev

Log:
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	Thu Feb  7 15:58:42 2008
@@ -24,29 +24,17 @@
         <oaf_attribute name="name" type="string"
                        _value="Evolution RSS Reader"/>
 
-        <!-- The short name of the component. Used internally by the
-           - shell. Should be the same as the component's GConf
-           - subtree (under /apps/evolution) and its local storage
-           - directory (under ~/.evolution)
-           -->
         <oaf_attribute name="evolution:component_alias" type="string"
                        value="evolution-rss"/>
 
-        <!-- This determines the label and icon displayed on the
-           - component's sidebar button, and the ordering of that
-           - button relative to the others.
-           -->
         <oaf_attribute name="evolution:button_label" type="string"
                        _value="RSS"/>
         <oaf_attribute name="evolution:button_icon" type="string"
-                       value="@ICONDIR@/rss.png"/>
+                       value="@ICON_DIR@/rss.png"/>
         <oaf_attribute name="evolution:button_sort_order" type="string"
                        value="10"/>
 
-        <!-- This determines the label and shortcut displayed in the
-           - shell's view menu.
-           -->
-        <oaf_attribute name="evolution:menu_label" type="string" _value="_Calendars"/>
+        <oaf_attribute name="evolution:menu_label" type="string" _value="_News"/>
         <oaf_attribute name="evolution:menu_accelerator" type="string" _value="*Control*F10"/>
     </oaf_server>
 

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Thu Feb  7 15:58:42 2008
@@ -111,6 +111,16 @@
 //#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"
@@ -6054,12 +6064,6 @@
         return evolution_config_control_new (control_widget);
 }
 
-EvolutionConfigControl*
-rss_component_new (void)
-{
-	g_print("component\n");
-}
-
 static BonoboObject *
 factory (BonoboGenericFactory *factory,
          const char *component_id,
@@ -6069,11 +6073,15 @@
 
 	g_print("component_id:%s\n", component_id);
 
-        if (strcmp (component_id, RSS_CONTROL_ID) == 0)
-                return BONOBO_OBJECT (rss_config_control_new ());
+       if (strcmp (component_id, RSS_CONTROL_ID) == 0)
+             return BONOBO_OBJECT (rss_config_control_new ());
 
         if (strcmp (component_id, COMPONENT_ID) == 0)
-                return BONOBO_OBJECT (rss_component_new ());
+	{
+		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	Thu Feb  7 15:58:42 2008
@@ -24,6 +24,8 @@
 #ifndef __RSS_H_
 #define __RSS_H_
 
+#include "src/rss-component.h"
+
 #define PLUGIN_INSTALL_DIR @PLUGIN_INSTALL_DIR@
 
 GConfClient *rss_gconf;