evolution-rss r158 - in trunk: . src
- From: lucilanga svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-rss r158 - in trunk: . src
- Date: Sun, 17 Feb 2008 14:02:32 +0000 (GMT)
Author: lucilanga
Date: Sun Feb 17 14:02:32 2008
New Revision: 158
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=158&view=rev
Log:
set_progressing fixes
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/evolution-rss.spec.in
trunk/src/Makefile.am
trunk/src/Makefile.in
trunk/src/rss.c
trunk/src/rss.h
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Feb 17 14:02:32 2008
@@ -1,4 +1,4 @@
-AC_INIT([evolution-rss], [0.0.7], http://gnome.eu.org/bugs/bugs.html)
+AC_INIT([evolution-rss], [0.0.8], http://gnome.eu.org/bugs/bugs.html)
AC_CONFIG_SRCDIR(src)
AM_INIT_AUTOMAKE
Modified: trunk/evolution-rss.spec.in
==============================================================================
--- trunk/evolution-rss.spec.in (original)
+++ trunk/evolution-rss.spec.in Sun Feb 17 14:02:32 2008
@@ -18,7 +18,7 @@
BuildRequires: evolution-devel
BuildRequires: evolution-data-server-devel
BuildRequires: dbus-glib-devel
-BuildRequires: firefox-devel
+#BuildRequires: firefox-devel
BuildRequires: perl(XML::Parser)
%description
@@ -29,7 +29,7 @@
#%patch
%build
-%configure --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}" --libdir=%{_libdir} --disable-webkit
+%configure --prefix="%{_prefix}" --sysconfdir="%{_sysconfdir}" --libdir=%{_libdir} --disable-webkit --disable-gecko
make %{?_smp_mflags}
%install
@@ -85,6 +85,8 @@
%doc TODO
%changelog
+* Sat Feb 16 2008 Lucian Langa <cooly gnome eu org>
+- Drop gecko requirements till xulrunner is fixed
* Tue Feb 12 2008 Lucian Langa <lucilanga gnome org>
- buildroot fixes
* Wed Feb 06 2008 Lucian Langa <lucilanga gnome org>
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sun Feb 17 14:02:32 2008
@@ -140,6 +140,7 @@
network-soup.c \
misc.c \
dbus.c \
+ rss-config-factory.c \
evolution-import-rss.c \
evolution-rss.schemas.in \
org-gnome-evolution-rss.eplug.xml \
Modified: trunk/src/Makefile.in
==============================================================================
--- trunk/src/Makefile.in (original)
+++ trunk/src/Makefile.in Sun Feb 17 14:02:32 2008
@@ -361,6 +361,7 @@
network-soup.c \
misc.c \
dbus.c \
+ rss-config-factory.c \
evolution-import-rss.c \
evolution-rss.schemas.in \
org-gnome-evolution-rss.eplug.xml \
Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c (original)
+++ trunk/src/rss.c Sun Feb 17 14:02:32 2008
@@ -335,84 +335,17 @@
return activity_id;
}
-/* I could really use this stuff exported through evolution include */
-
-struct _ActivityInfo {
- char *component_id;
- GdkPixbuf *icon_pixbuf;
- int error_type;
- guint id;
- char *information;
- gboolean cancellable;
- double progress;
- GtkWidget *menu;
- void (*cancel_func) (gpointer data);
- gpointer data;
- gpointer error;
- time_t error_time;
-};
-typedef struct _ActivityInfo ActivityInfo;
-
-struct _EActivityHandlerPrivate {
- guint next_activity_id;
- GList *activity_infos;
- GSList *task_bars;
-// ELogger *logger;
- guint error_timer;
- guint error_flush_interval;
-
-};
-
-static GList *
-lookup_activity (GList *list,
- guint activity_id,
- int *order_number_return)
-{
- GList *p;
- int i;
-
- for (p = list, i = 0; p != NULL; p = p->next, i ++) {
- ActivityInfo *activity_info;
-
- activity_info = (ActivityInfo *) p->data;
- if (activity_info->id == activity_id) {
- *order_number_return = i;
- return p;
- }
- }
-
- *order_number_return = -1;
- return NULL;
-}
-
void
-taskbar_op_set_progress(gpointer key, gdouble progress)
+taskbar_op_set_progress(gpointer key, gchar *msg, gdouble progress)
{
EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ());
guint activity_id = GPOINTER_TO_INT(g_hash_table_lookup(rf->activity, key));
if (activity_id)
{
-
- /* does it even makes sense to setup information everytime progress is updated ??? */
- EActivityHandlerPrivate *priv = activity_handler->priv;
- ActivityInfo *activity_info;
- GList *p;
- int order_number;
-// g_hash_table_foreach(rf->activity, print_hash, NULL);
-
- p = lookup_activity (priv->activity_infos, activity_id, &order_number);
- if (p == NULL) {
- g_warning ("EActivityHandler: unknown operation %d", activity_id);
- return;
- }
-
- activity_info = (ActivityInfo *) p->data;
-// g_print("--message:%s--\n", activity_info->information);
-
e_activity_handler_operation_progressing(activity_handler,
activity_id,
- g_strdup(activity_info->information),
+ g_strdup(msg),
progress);
}
}
@@ -476,7 +409,16 @@
g_free(furl);
}
#endif
- taskbar_op_set_progress(data, (gdouble)fraction);
+ gchar *tmsg;
+ gchar *type = g_hash_table_lookup(rf->hrt, lookup_key(data));
+ if (strncmp(type, "-",1) == 0)
+ tmsg = g_strdup_printf("Fetching %s: %s",
+ "RSS", data);
+ else
+ tmsg = g_strdup_printf("Fetching %s: %s",
+ type, data);
+ taskbar_op_set_progress(data, tmsg, (gdouble)fraction);
+ g_free(tmsg);
}
break;
case NET_STATUS_DONE:
Modified: trunk/src/rss.h
==============================================================================
--- trunk/src/rss.h (original)
+++ trunk/src/rss.h Sun Feb 17 14:02:32 2008
@@ -252,7 +252,7 @@
void rss_mozilla_init(void);
#endif
gpointer lookup_key(gpointer key);
-void taskbar_op_set_progress(gpointer key, gdouble progress);
+void taskbar_op_set_progress(gpointer key, gchar *msg, gdouble progress);
void taskbar_op_finish(gpointer key);
void taskbar_push_message(gchar *message);
void taskbar_pop_message(void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]