evolution-rss r224 - in trunk: . src
- From: lucilanga svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-rss r224 - in trunk: . src
- Date: Fri, 21 Mar 2008 15:01:20 +0000 (GMT)
Author: lucilanga
Date: Fri Mar 21 15:01:19 2008
New Revision: 224
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=224&view=rev
Log:
progress for add/edit feeds
Modified:
trunk/ChangeLog
trunk/TODO
trunk/src/org-gnome-evolution-rss.error.xml
trunk/src/rss-config-factory.c
trunk/src/rss-config-factory.h
trunk/src/rss.c
Modified: trunk/TODO
==============================================================================
--- trunk/TODO (original)
+++ trunk/TODO Fri Mar 21 15:01:19 2008
@@ -2,7 +2,6 @@
* maybe implement md5 for uniqueing articles (for broken feeds)
* make setup dialog modal when fetch_feed active
* add syndicate icon for News&Blogs folder
- * offline storage for article's home page
* probably move to soup_unblocking when rendering of an article
* when browsing a different feed/mail folder cancel all sessions
* also create groups when importing
@@ -14,10 +13,7 @@
* check mozembed widget / thread when quitting
* test cancelation signal check rf->cancel fetch feed might reset it always 0 and crashing when finish_feed
* jump to folder when adding through d-bus
- * check webkit rendering
* make Cancel All from S&R work
- * obey ttl entity
- * search in the content of page for feed
* move evolution detection to m4 to ease up integration in other plugins
* change ifdef labels for debuging by level
* disable javascript alerts !?
@@ -33,9 +29,11 @@
* crash (mail_append_message) if folder contains .lock file ? or ibex crashes
* implement notify back of imported feed perhaps libnotify
* prefetch html content for all webkits (perhaps temp file)
+ * offline storage for article's home page
* implement web controls for diferent redering <Webkits> or <Gecko>
* convert reading feeds progress bar to articles number that will actually be read
* force soup to follow redirects (304) test on fedora weekly news
* check loading of images in certain feeds
* convert rest of non-intrusive error messages
- * close dialog window after addiong/editing a feed an put some progress.
+ * search in the content of page for feed
+ * obey ttl entity
Modified: trunk/src/org-gnome-evolution-rss.error.xml
==============================================================================
--- trunk/src/org-gnome-evolution-rss.error.xml (original)
+++ trunk/src/org-gnome-evolution-rss.error.xml Fri Mar 21 15:01:19 2008
@@ -8,6 +8,11 @@
<button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
</error>
+ <error id="rssmsg" type="info">
+ <_primary>Updating Feeds...</_primary>
+ <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+ </error>
+
<error id="generr" type="error">
<_primary>{0}</_primary>
<button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c (original)
+++ trunk/src/rss-config-factory.c Fri Mar 21 15:01:19 2008
@@ -545,10 +545,28 @@
////////////////////
static void
+msg_feeds_response(GtkWidget *selector, guint response, gpointer user_data)
+{
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
+ if (response == GTK_RESPONSE_CANCEL)
+ rf->cancel = 1;
+ gtk_widget_destroy(selector);
+}
+
+static void
feeds_dialog_add(GtkDialog *d, gpointer data)
{
gchar *text;
add_feed *feed = create_dialog_add(NULL, NULL);
+ if (feed->dialog)
+ gtk_widget_destroy(feed->dialog);
+ GtkWidget *msg_feeds = e_error_new(NULL, "org-gnome-evolution-rss:rssmsg", NULL);
+ gtk_window_set_keep_above(GTK_WINDOW(msg_feeds), TRUE);
+ g_signal_connect(msg_feeds, "response", G_CALLBACK(msg_feeds_response), NULL);
+ gtk_widget_show_all(msg_feeds);
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
if (feed->feed_url && strlen(feed->feed_url))
{
text = feed->feed_url;
@@ -568,8 +586,7 @@
g_hash_table_foreach(rf->hrname, construct_list, model);
save_gconf_feed();
}
-out: if (feed->dialog)
- gtk_widget_destroy(feed->dialog);
+out: gtk_widget_destroy(msg_feeds);
g_free(feed);
}
@@ -854,8 +871,18 @@
if (name)
{
add_feed *feed = create_dialog_add(name, feed_name);
+ if (feed->dialog)
+ gtk_widget_destroy(feed->dialog);
+ GtkWidget *msg_feeds = e_error_new(NULL, "org-gnome-evolution-rss:rssmsg", NULL);
+ gtk_window_set_keep_above(GTK_WINDOW(msg_feeds), TRUE);
+ g_signal_connect(msg_feeds, "response", G_CALLBACK(msg_feeds_response), NULL);
+ gtk_widget_show_all(msg_feeds);
+ while (gtk_events_pending ())
+ gtk_main_iteration ();
if (!feed->add)
goto out;
+ g_print("name:%s\n", name);
+ g_print("feed_url:%s\n", feed->feed_url);
text = feed->feed_url;
feed->feed_url = sanitize_url(feed->feed_url);
g_free(text);
@@ -920,8 +947,7 @@
save_gconf_feed();
}
}
-out: if (feed->dialog)
- gtk_widget_destroy(feed->dialog);
+out: gtk_widget_destroy(msg_feeds);
g_free(feed);
}
}
Modified: trunk/src/rss-config-factory.h
==============================================================================
--- trunk/src/rss-config-factory.h (original)
+++ trunk/src/rss-config-factory.h Fri Mar 21 15:01:19 2008
@@ -20,6 +20,7 @@
#define __RSS_CONFIG_FACTORY_H_
void store_redraw(GtkTreeView *data);
+static void import_dialog_response(GtkWidget *selector, guint response, gpointer user_data);
#endif /*__RSS_CONFIG_FACTORY_H_*/
Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c (original)
+++ trunk/src/rss.c Fri Mar 21 15:01:19 2008
@@ -2794,15 +2794,15 @@
if (!rf->online)
return;
-// if (!rf->setup || g_hash_table_size(rf->hrname)<1)
-// {
+ if (!rf->setup || g_hash_table_size(rf->hrname)<1)
+ {
/* e_error_run(NULL,
"org-gnome-evolution-rss:generr",
_("No RSS feeds configured!"),
NULL);*/
- taskbar_push_message("No RSS feeds configured!");
+ taskbar_push_message(_("No RSS feeds configured!"));
return;
- // }
+ }
if (!feeds_enabled())
{
e_error_run(NULL,
@@ -2906,12 +2906,12 @@
rf->t = t;
-/* if (!rf->setup || g_hash_table_size(rf->hrname)<1)
+ if (!rf->setup || g_hash_table_size(rf->hrname)<1)
{
- e_error_run(NULL, "org-gnome-evolution-rss:generr", "No RSS feeds configured!", NULL);*/
- taskbar_push_message("No RSS feeds configured!");
+ //e_error_run(NULL, "org-gnome-evolution-rss:generr", "No RSS feeds configured!", NULL);*/
+ taskbar_push_message(_("No RSS feeds configured!"));
return;
-// }
+ }
#ifdef EVOLUTION_2_12
struct _send_info *info;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]