[evolution-rss] misc cleanups
- From: Lucian Langa <lucilanga src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-rss] misc cleanups
- Date: Wed, 2 Sep 2009 12:11:59 +0000 (UTC)
commit 3173642d24792cbdc149eb6ad84a13ad16915134
Author: Lucian Langa <lucilanga gnome org>
Date: Wed Sep 2 15:11:47 2009 +0300
misc cleanups
src/rss-config-factory.c | 4 ++--
src/rss.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index 23db073..7cc8665 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -37,6 +37,7 @@
#if EVOLUTION_VERSION < 22800 //kb//
#include <shell/evolution-config-control.h>
+#include <bonobo/bonobo-shlib-factory.h>
#else
#include <misc/e-preferences-window.h>
#include <mail/e-mail-local.h>
@@ -44,7 +45,6 @@
#endif
#include <e-util/e-error.h>
-#include <bonobo/bonobo-shlib-factory.h>
#ifdef HAVE_LIBSOUP_GNOME
#include <libsoup/soup-gnome.h>
@@ -2607,6 +2607,7 @@ rss_config_control_new (void)
#endif
}
+#if EVOLUTION_VERSION < 22800
static BonoboObject *
factory (BonoboGenericFactory *factory,
const char *component_id,
@@ -2623,7 +2624,6 @@ factory (BonoboGenericFactory *factory,
return NULL;
}
-#if EVOLUTION_VERSION < 22800
BONOBO_ACTIVATION_SHLIB_FACTORY (FACTORY_ID, "Evolution RSS component factory", factory, NULL)
#endif
diff --git a/src/rss.c b/src/rss.c
index eb01846..4175e8f 100644
--- a/src/rss.c
+++ b/src/rss.c
@@ -348,7 +348,7 @@ rss_error(gpointer key, gchar *name, gchar *error, gchar *emsg)
G_CALLBACK(err_destroy),
NULL);
g_object_set_data (
- ed, "response-handled",
+ (GObject *)ed, "response-handled",
GINT_TO_POINTER (TRUE));
g_signal_connect(ed,
"destroy",
@@ -4605,8 +4605,8 @@ gboolean
e_plugin_ui_init (GtkUIManager *ui_manager,
EShellView *shell_view)
{
- g_print("ui init\n");
rss_shell_view = shell_view;
+ return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]