[evolution-rss] remove old cruft

[Lucian Langa <lucilanga src gnome org>]

commit b1f6693009c8d40ecf331cb0bb8be871ede229f6
Author: Lucian Langa <lucilanga gnome org>
Date:   Sun Oct 24 09:55:32 2010 +0300

    remove old cruft

 m4/evolution.m4          |    4 --
 src/gecko-utils.cpp      |    3 --
 src/notification.c       |   18 ----------
 src/rss-config-factory.c |   83 ----------------------------------------------
 src/rss-image.c          |    6 ---
 5 files changed, 0 insertions(+), 114 deletions(-)
---
diff --git a/m4/evolution.m4 b/m4/evolution.m4
index 89403b4..8497d0f 100644
--- a/m4/evolution.m4
+++ b/m4/evolution.m4
@@ -65,10 +65,6 @@ AC_MSG_RESULT($EVOLUTION_VERSION)
 AC_SUBST(EVOLUTION_EXEC_VERSION)
 
 evolution_version_int="$(echo "$EVOLUTION_VERSION" | $AWK -F . '{print [$]1 * 10000 + [$]2 * 100 + [$]3}')"
-if test "$evolution_version_int" -ge "21100"; then
-        AC_DEFINE_UNQUOTED(EVOLUTION_2_12,1, [evolution mail 2.12 present])
-        AC_SUBST(EVOLUTION_2_12)
-fi
 AC_SUBST(evolution_version_int)
 
 MINOR_VERSION="$(echo $EVOLUTION_VERSION|cut -d. -f2|$AWK -F . '{print 1000 * [$]1}')"
diff --git a/src/gecko-utils.cpp b/src/gecko-utils.cpp
index dd9f92d..42b74a1 100644
--- a/src/gecko-utils.cpp
+++ b/src/gecko-utils.cpp
@@ -274,9 +274,6 @@ gecko_shutdown (void)
 #ifdef XPCOM_GLUE
 	XPCOMGlueShutdown();
 	NS_ShutdownXPCOM (nsnull);
-#if (EVOLUTION_VERSION < 22300)
-	PR_ProcessExit (0);
-#endif
 #else
 	gtk_moz_embed_pop_startup ();
 #endif
diff --git a/src/notification.c b/src/notification.c
index b5b61cd..f32dd5a 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -235,9 +235,6 @@ taskbar_op_new(gchar *message, gpointer key)
 	char *mcp;
 	guint activity_id;
 #endif
-#if EVOLUTION_VERSION < 22306
-	GdkPixbuf *progress_icon;
-#endif
 
 #if EVOLUTION_VERSION >= 22900 //kb//
 
@@ -269,7 +266,6 @@ taskbar_op_new(gchar *message, gpointer key)
 	activity_handler =
 		mail_component_peek_activity_handler (mail_component_peek ());
 	mcp = g_strdup_printf("%p", mail_component_peek());
-#if (EVOLUTION_VERSION >= 22306)
 	activity_id =
 		e_activity_handler_cancelable_operation_started(
 			activity_handler,
@@ -278,20 +274,6 @@ taskbar_op_new(gchar *message, gpointer key)
 			TRUE,
 			(void (*) (gpointer))taskbar_op_abort,
 			key);
-#else
-	progress_icon =
-		e_icon_factory_get_icon (
-			"mail-unread",
-			E_ICON_SIZE_MENU);
-	activity_id =
-		e_activity_handler_cancelable_operation_started(
-			activity_handler,
-			"evolution-mail",
-			progress_icon,
-			message, TRUE,
-			(void (*) (gpointer))taskbar_op_abort,
-			key);
-#endif
 	g_free(mcp);
 	return activity_id;
 #endif //kb//
diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c
index ec6b326..b2ffc0a 100644
--- a/src/rss-config-factory.c
+++ b/src/rss-config-factory.c
@@ -3758,89 +3758,6 @@ rss_config_control_new (void)
 		G_CALLBACK(start_check_cb),
 		(gpointer)GCONF_KEY_SEARCH_RSS);
 
-
-#if (EVOLUTION_VERSION < 21900)		// include devel too
-
-	/*first make the tab visible */
-	g_object_set(
-		GTK_WIDGET (gtk_builder_get_object(sf->gui, "label_HTML")),
-		"visible",
-		TRUE,
-		NULL);
-	g_object_set(
-		GTK_WIDGET (gtk_builder_get_object(sf->gui, "vbox_HTML")),
-		"visible",
-		TRUE,
-		NULL);
-	/* HTML tab */
-	sf->combo_hbox = GTK_WIDGET (gtk_builder_get_object(sf->gui, "hbox17"));
-	GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
-	store = gtk_list_store_new(1, G_TYPE_STRING);
-	GtkWidget *combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
-	for (i=0;i<3;i++) {
-		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(
-			store,
-			&iter,
-			0,
-			_(engines[i].label),
-			-1);
-	}
-	gtk_cell_layout_pack_start (
-		GTK_CELL_LAYOUT (combo),
-		renderer,
-		TRUE);
-	gtk_cell_layout_set_attributes (
-		GTK_CELL_LAYOUT (combo),
-		renderer,
-		"text", 0,
-		NULL);
-	guint render = GPOINTER_TO_INT(
-		gconf_client_get_int(
-			rss_gconf,
-			GCONF_KEY_HTML_RENDER,
-			NULL));
-
-	switch (render) {
-		case 10:
-			gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-			break;
-		case 1:
-#ifndef HAVE_WEBKIT
-			gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-			break;
-#endif
-		case 2:
-#ifndef HAVE_GECKO
-			gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
-			break;
-#endif
-		default:
-			g_printf("Selected render not supported! Failling back to default.\n");
-			gtk_combo_box_set_active(GTK_COMBO_BOX(combo), render);
-
-	}
-
-	gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo),
-					renderer,
-					set_sensitive,
-					NULL, NULL);
-
-#if !defined(HAVE_GECKO) && !defined (HAVE_WEBKIT)
-	GtkWidget *label_webkit = GTK_WIDGET (gtk_builder_get_object(sf->gui, "label_webkits"));
-	gtk_label_set_text(
-		GTK_LABEL(label_webkit),
-		_("Note: In order to be able to use Mozilla (Firefox) or Apple Webkit \n\
-		as renders you need firefox or webkit devel package \n\
-		installed and evolution-rss should be recompiled to see those packages."));
-	gtk_widget_show(label_webkit);
-#endif
-	g_signal_connect (combo, "changed",
-		G_CALLBACK (render_engine_changed), NULL);
-	gtk_widget_show(combo);
-	gtk_box_pack_start(GTK_BOX(sf->combo_hbox), combo, FALSE, FALSE, 0);
-#endif
-
 	sf->import = GTK_WIDGET (gtk_builder_get_object(sf->gui, "import"));
 	sf->export = GTK_WIDGET (gtk_builder_get_object(sf->gui, "export"));
 	g_signal_connect(
diff --git a/src/rss-image.c b/src/rss-image.c
index 78480e4..2c43f90 100644
--- a/src/rss-image.c
+++ b/src/rss-image.c
@@ -368,9 +368,7 @@ finish_create_icon (SoupSession *soup_sess, SoupMessage *msg, FEED_IMAGE *user_d
 					user_data->img_file,
 					O_RDWR|O_CREAT, 0666, NULL);
 		finish_image(soup_sess, msg, feed_fs);
-#if (EVOLUTION_VERSION >= 22703)
 		display_folder_icon(evolution_store, user_data->key);
-#endif
 	}
 	g_free(user_data->key);
 	g_free(user_data);
@@ -386,14 +384,11 @@ finish_create_icon_stream (
 #endif
 {
 	finish_image(soup_sess, msg, user_data->feed_fs);
-#if (EVOLUTION_VERSION >= 22703)
 	display_folder_icon(evolution_store, user_data->key);
-#endif
 	g_free(user_data->key);
 	g_free(user_data);
 }
 
-#if (EVOLUTION_VERSION >= 22703)
 gboolean
 display_folder_icon(GtkTreeStore *tree_store, gchar *key)
 {
@@ -479,7 +474,6 @@ out:	g_free(img_file);
 	g_free(feed_dir);
 	return result;
 }
-#endif
 
 gchar *
 decode_image_cache_filename(gchar *name)