evolution-rss r368 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Tue Sep  2 15:01:04 2008
New Revision: 368
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=368&view=rev

Log:
2008-09-02  Lucian Langa  <lucilanga gnome org>

* src/rss.c: org_gnome_cooly_format_rss
fix for #550313: fix gtkhtml view with
dark theme
* src/rss-config-factory.c
  src/org-gnome-evolution-rss.eplug.xml
  fix for #550413: deleting subscriptions

Modified:
   trunk/ChangeLog
   trunk/src/gecko-utils.cpp
   trunk/src/org-gnome-evolution-rss.error.xml
   trunk/src/rss-config-factory.c
   trunk/src/rss.c

Modified: trunk/src/gecko-utils.cpp
==============================================================================
--- trunk/src/gecko-utils.cpp	(original)
+++ trunk/src/gecko-utils.cpp	Tue Sep  2 15:01:04 2008
@@ -157,7 +157,7 @@
 #ifdef XPCOM_GLUE
 	XPCOMGlueShutdown();
 	NS_ShutdownXPCOM (nsnull);
-	PR_ProcessExit (0);
+//	PR_ProcessExit (0);
 #else
 	gtk_moz_embed_pop_startup ();
 #endif

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	Tue Sep  2 15:01:04 2008
@@ -23,4 +23,13 @@
     <_secondary>{1}</_secondary>
     <button stock="gtk-ok" response="GTK_RESPONSE_OK"/>
   </error>
+
+  <error type="question" id="ask-delete-feed" default="GTK_RESPONSE_CANCEL">
+    <title>Delete "{0}"?</title>
+    <primary>Really delete feed '{0}' ?</primary>
+    <secondary>{1}</secondary>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+    <button stock="gtk-delete" response="GTK_RESPONSE_OK"/>
+  </error>
+
 </error-list>

Modified: trunk/src/rss-config-factory.c
==============================================================================
--- trunk/src/rss-config-factory.c	(original)
+++ trunk/src/rss-config-factory.c	Tue Sep  2 15:01:04 2008
@@ -804,10 +804,8 @@
   GtkWidget *cancelbutton1;
   GtkWidget *okbutton1;
 
-  dialog1 = gtk_dialog_new ();
+  dialog1 = e_error_new(NULL, "org-gnome-evolution-rss:ask-delete-feed", msg, NULL);
   gtk_window_set_keep_above(GTK_WINDOW(dialog1), TRUE);
-  gtk_window_set_title (GTK_WINDOW (dialog1), _("Delete Feed?"));
-  gtk_window_set_type_hint (GTK_WINDOW (dialog1), GDK_WINDOW_TYPE_HINT_DIALOG);
 
   dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
   gtk_widget_show (dialog_vbox1);
@@ -817,12 +815,6 @@
   gtk_box_pack_start (GTK_BOX (dialog_vbox1), vbox1, TRUE, TRUE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox1), 10);
 
-  label1 = gtk_label_new (msg);
-  gtk_widget_show (label1);
-  gtk_box_pack_start (GTK_BOX (vbox1), label1, TRUE, TRUE, 0);
-  gtk_label_set_use_markup (GTK_LABEL (label1), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_CENTER);
-
   checkbutton1 = gtk_check_button_new_with_mnemonic (_("Remove folder contents"));
   gtk_widget_show (checkbutton1);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton1),
@@ -837,16 +829,6 @@
   gtk_widget_show (dialog_action_area1);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
 
-  okbutton1 = gtk_button_new_from_stock ("gtk-delete");
-  gtk_widget_show (okbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), okbutton1, GTK_RESPONSE_OK);
-  GTK_WIDGET_SET_FLAGS (okbutton1, GTK_CAN_DEFAULT);
-
-  cancelbutton1 = gtk_button_new_with_label (_("Do not delete"));
-  gtk_widget_show (cancelbutton1);
-  gtk_dialog_add_action_widget (GTK_DIALOG (dialog1), cancelbutton1, GTK_RESPONSE_CANCEL);
-  GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_CAN_DEFAULT);
-  GTK_WIDGET_SET_FLAGS (cancelbutton1, GTK_HAS_FOCUS);
   return dialog1;
 }
 
@@ -863,12 +845,10 @@
         {
                 rf->import = 1;
                 gtk_tree_model_get (model, &iter, 1, &name, -1);
-                gchar *msg = g_strdup_printf(_("Are you sure you want\n to remove <b>%s</b>?"), name);
-                GtkWidget *rfd = remove_feed_dialog(msg);
+                GtkWidget *rfd = remove_feed_dialog(name);
                 gtk_widget_show(rfd);
                 g_signal_connect(rfd, "response", G_CALLBACK(delete_response), data);
                 g_signal_connect(rfd, "destroy", G_CALLBACK(destroy_delete), rfd);
-                g_free(msg);
                 g_free(name);
         }
 }

Modified: trunk/src/rss.c
==============================================================================
--- trunk/src/rss.c	(original)
+++ trunk/src/rss.c	Tue Sep  2 15:01:04 2008
@@ -3296,7 +3296,6 @@
 
         struct _send_info *info = data;
 
-        printf("Operation '%s', percent %d\n");
         switch (pc) {
         case CAMEL_OPERATION_START:
                 pc = 0;
@@ -3572,7 +3571,7 @@
 				rf->activity = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
 			if (!rf->error_hash)	//keeping trask of taskbar errors
 				rf->error_hash = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-			atexit(rss_finalize);
+//			atexit(rss_finalize);
 			guint render = GPOINTER_TO_INT(
 				gconf_client_get_int(rss_gconf, 
 						GCONF_KEY_HTML_RENDER, 
@@ -3602,6 +3601,14 @@
 	return 0;
 }
 
+void e_plugin_lib_disable(EPluginLib *ep);
+
+void
+e_plugin_lib_disable(EPluginLib *ep)
+{
+	g_print("DIE!\n");
+}
+
 void
 create_mail(create_feed *CF)
 {
@@ -3704,13 +3711,11 @@
 		camel_medium_set_content_object(CAMEL_MEDIUM(new), CAMEL_DATA_WRAPPER(rtext));
 	camel_folder_append_message(mail_folder, new, info, &appended_uid, ex);
 		g_print("weakify this!!!\n");
-		g_print("append:%s\n", appended_uid);
 	if (appended_uid != NULL)
 	{
 		filter_uids = g_ptr_array_sized_new(1);
 		g_ptr_array_add(filter_uids, appended_uid);
 		mail_filter_on_demand (mail_folder, filter_uids);
-		g_print("removed:%s\n", appended_uid);
 	//	g_ptr_array_free(filter_uids, FALSE);
 	}
 	camel_folder_sync(mail_folder, FALSE, NULL);