evolution-rss r287 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Mon Jun  9 05:07:01 2008
New Revision: 287
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=287&view=rev

Log:
2008-06-07  Lucian Langa  <lucilanga gnome org>

        * make network timeout customisable

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/evolution-rss.schemas.in
   trunk/src/network.h
   trunk/src/rss-config-factory.c
   trunk/src/rss-html-rendering.glade
   trunk/src/rss.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Mon Jun  9 05:07:01 2008
@@ -16,7 +16,6 @@
 	* implement USM (universal subscription mechanism)
 	* fix authentication for proxy dialog
 	* make auth dialog not intrusive (peek other software)
-	* fix move->rename
 	* fix ubuntu crashing when wrong entities (<0.0.6) and feed conf files stored in a file
 	* crash (mail_append_message) if folder contains .lock file ? or ibex crashes
 	* implement notify back of imported feed perhaps libnotify
@@ -28,6 +27,6 @@
 	* obey ttl entity
 	* check rename feed when evo 2.24 x86_64 
 	* when adding a feed as opml file offer to import (file detection)
+	* fix move->rename
 	* run-time migration function from text/evolution-rss-feed -> x-evolution/evolution-rss-feed
-	* possibly make network timeout customizable
 	* test new proxy autehntification

Modified: trunk/src/evolution-rss.schemas.in
==============================================================================
--- trunk/src/evolution-rss.schemas.in	(original)
+++ trunk/src/evolution-rss.schemas.in	Mon Jun  9 05:07:01 2008
@@ -66,9 +66,23 @@
       <type>int</type>
       <default>0</default>
       <locale name="C">
-        <short>Hostname of the proxy server</short>
+        <short>Html render</short>
         <long>
-    	    Hostname of the proxy server.
+    	    Type HTML Render used to display html pages.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/evolution/evolution-rss/network_timeout</key>
+      <applyto>/apps/evolution/evolution-rss/network_timeout</applyto>
+      <owner>evolution-rss</owner>
+      <type>float</type>
+      <default>300</default>
+      <locale name="C">
+        <short>Network timeout</short>
+        <long>
+    	    Interval in seconds before a conection is dropped.
         </long>
       </locale>
     </schema>

Modified: trunk/src/network.h
==============================================================================
--- trunk/src/network.h	(original)
+++ trunk/src/network.h	Mon Jun  9 05:07:01 2008
@@ -27,6 +27,7 @@
 #define GCONF_KEY_AUTH_PROXY "/apps/evolution/evolution-rss/auth_proxy"
 #define GCONF_KEY_USER_PROXY "/apps/evolution/evolution-rss/user_proxy"
 #define GCONF_KEY_PASS_PROXY "/apps/evolution/evolution-rss/pass_proxy"
+#define GCONF_KEY_NETWORK_TIMEOUT "/apps/evolution/evolution-rss/network_timeout"
 
 #define GCONF_E_SHELL_NETWORK_CONFIG_PATH "/apps/evolution/shell/network_config/"
 #define GCONF_E_HTTP_HOST_KEY GCONF_E_SHELL_NETWORK_CONFIG_PATH "http_host"

Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c	(original)
+++ trunk/src/rss-config-factory.c	Mon Jun  9 05:07:01 2008
@@ -35,6 +35,7 @@
         GtkWidget   *combobox;
         GtkWidget   *check1;
         GtkWidget   *check2;
+        GtkWidget   *nettimeout;
         GtkWidget   *check3;
 } UIData;
 
@@ -1523,6 +1524,14 @@
         return;
 }
 
+
+static void
+network_timeout_cb (GtkWidget *widget, gpointer data)
+{
+    gconf_client_set_float (rss_gconf, GCONF_KEY_NETWORK_TIMEOUT,
+                gtk_spin_button_get_value((GtkSpinButton*)widget), NULL);
+}
+
 static void
 destroy_ui_data (gpointer data)
 {
@@ -1623,6 +1632,13 @@
 		G_CALLBACK(start_check_cb), 
 		GCONF_KEY_HTML_JS);
 
+	ui->nettimeout = glade_xml_get_widget(ui->xml, "nettimeout");
+  	gdouble adj = gconf_client_get_float(rss_gconf, GCONF_KEY_NETWORK_TIMEOUT, NULL);
+  	if (adj)
+		gtk_spin_button_set_value((GtkSpinButton *)ui->nettimeout, adj);
+	g_signal_connect(ui->nettimeout, "changed", G_CALLBACK(network_timeout_cb), ui->nettimeout);
+	g_signal_connect(ui->nettimeout, "value-changed", G_CALLBACK(network_timeout_cb), ui->nettimeout);
+
         ui->gconf = gconf_client_get_default ();
 	hbox = gtk_vbox_new (FALSE, 0);
 

Modified: trunk/src/rss-html-rendering.glade
==============================================================================
--- trunk/src/rss-html-rendering.glade	(original)
+++ trunk/src/rss-html-rendering.glade	Mon Jun  9 05:07:01 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.4 on Wed Jun  4 19:43:17 2008 -->
+<!--Generated with glade3 3.4.4 on Sat Jun  7 14:43:27 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="window1">
     <child>
@@ -97,16 +97,26 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkSpinButton" id="spinbutton1">
+                      <widget class="GtkSpinButton" id="nettimeout">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="adjustment">0 0 100 1 10 10</property>
+                        <property name="adjustment">60 60 3600 1 10 10</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="GtkLabel" id="label4">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">seconds</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
                     <property name="fill">False</property>

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Mon Jun  9 05:07:01 2008
@@ -631,9 +631,10 @@
 	if (nettime_id)
 		g_source_remove(nettime_id);
 
-	nettime_id = g_timeout_add (NETWORK_TIMEOUT,
-                           (GtkFunction) timeout_soup,
-                           0);
+	nettime_id = g_timeout_add (
+				gconf_client_get_float(rss_gconf, GCONF_KEY_NETWORK_TIMEOUT, NULL)*1000,
+				(GtkFunction) timeout_soup,
+                           	0);
 }
 
 void
@@ -2775,6 +2776,8 @@
 	CamelStore *store = mail_component_peek_local_store(NULL);
 	camel_object_hook_event(store, "folder_renamed",
                                 (CamelObjectEventHookFunc)store_folder_renamed, NULL);
+	camel_object_hook_event(store, "folder_changed",
+                                (CamelObjectEventHookFunc)store_folder_renamed, NULL);
 	camel_object_hook_event((void *)mail_component_peek_session(NULL),
 				 "online", rss_online, NULL);
 }