[Commits] [SCM] claws branch, master, updated. 3.11.1-60-gd8846b7

[mones at claws-mail.org]

The branch, master has been updated
       via  d8846b7338e9318fc1d818ffb4a644ce9c371db4 (commit)
      from  72dbf64f398e4c56d31819c24aabd83ba3476c9b (commit)

Summary of changes:
 src/plugins/rssyl/rssyl_feed_props.c    |   18 ------------------
 src/plugins/rssyl/rssyl_prefs.c         |   11 -----------
 src/plugins/rssyl/rssyl_subscribe_gtk.c |   14 --------------
 3 files changed, 43 deletions(-)


- Log -----------------------------------------------------------------
commit d8846b7338e9318fc1d818ffb4a644ce9c371db4
Author: Ricardo Mones <ricardo at mones.org>
Date:   Sat Jan 17 17:31:24 2015 +0100

    Remove GTK+ checks lower than required version
    
    INSTALL file says 2.16 is required since some time ago, hence
    removing these remnants from the glorious days of GTK+2 :)

diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index b702a03..2bf3c3f 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -241,9 +241,6 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 						*cancel_hbox, *cancel_image, *cancel_label, *ok_button, *ok_align,
 						*ok_hbox, *ok_image, *ok_label, *trim_button, *silent_update_label;
 	GtkObject *adj;
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	GtkTooltips *tooltips;
-#endif
 	gint refresh;
 	gint row = 0;
 
@@ -256,11 +253,6 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 	/* Window */
 	feedprop->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	tooltips = gtk_tooltips_new();
-	gtk_tooltips_enable(tooltips);
-#endif
-
 	/* URL entry */
 	feedprop->url = gtk_entry_new();
 	gtk_entry_set_text(GTK_ENTRY(feedprop->url), ritem->url);
@@ -315,13 +307,8 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 
 	/* "Trim" button */
 	trim_button = gtk_button_new_with_mnemonic(_("_Trim"));
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	gtk_tooltips_set_tip(tooltips, trim_button,
-			_("Update feed, deleting items which are no longer in the source feed"), NULL);
-#else
 	gtk_widget_set_tooltip_text(trim_button,
 			_("Update feed, deleting items which are no longer in the source feed"));
-#endif
 
 	feedprop->fetch_comments = gtk_check_button_new_with_mnemonic(
 			_("Fetch comments if possible"));
@@ -377,13 +364,8 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 	gtk_toggle_button_set_active(
 			GTK_TOGGLE_BUTTON(feedprop->ignore_title_rename),
 			ritem->ignore_title_rename);
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	gtk_tooltips_set_tip(tooltips, feedprop->ignore_title_rename,
-			_("Enable this to keep current folder name, even if feed author changes title of the feed."), NULL);
-#else
 	gtk_widget_set_tooltip_text(feedprop->ignore_title_rename,
 			_("Enable this to keep current folder name, even if feed author changes title of the feed."));
-#endif
 
 	/* Verify SSL peer certificate */
 	feedprop->ssl_verify_peer = gtk_check_button_new_with_label(
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index 6b8b050..624c485 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -111,12 +111,6 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 	GtkObject *refresh_adj;
 	GtkWidget *cookies_path;
 	GtkWidget *ssl_verify_peer;
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	GtkTooltips *tooltips;
-
-	tooltips = gtk_tooltips_new();
-	gtk_tooltips_enable(tooltips);
-#endif
 
 	table = gtk_table_new(3, 2, FALSE);
 	gtk_container_set_border_width(GTK_CONTAINER(table), 5);
@@ -161,13 +155,8 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 	gtk_entry_set_text(GTK_ENTRY(cookies_path), rssyl_prefs.cookies_path);
 	gtk_table_attach(GTK_TABLE(table), cookies_path, 1, 2, row, row+1,
 			GTK_FILL, 0, 0, 0);
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	gtk_tooltips_set_tip(tooltips, cookies_path,
-			_("Path to Netscape-style cookies.txt file containing your cookies"), NULL);
-#else
 	gtk_widget_set_tooltip_text(cookies_path,
 			_("Path to Netscape-style cookies.txt file containing your cookies"));
-#endif
 
 	row++;
 
diff --git a/src/plugins/rssyl/rssyl_subscribe_gtk.c b/src/plugins/rssyl/rssyl_subscribe_gtk.c
index 932883c..be8cc6e 100644
--- a/src/plugins/rssyl/rssyl_subscribe_gtk.c
+++ b/src/plugins/rssyl/rssyl_subscribe_gtk.c
@@ -37,9 +37,6 @@
 
 void rssyl_subscribe_dialog(RSubCtx *ctx) {
 	GtkWidget *win, *vbox, *title, *titleframe, *titlelabel, *editprops;
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	GtkTooltips *tooltips;
-#endif
 	gint ret;
 	gchar *newtitle;
 
@@ -57,11 +54,6 @@ void rssyl_subscribe_dialog(RSubCtx *ctx) {
 
 	vbox = gtk_dialog_get_content_area(GTK_DIALOG(win));
 
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	tooltips = gtk_tooltips_new();
-	gtk_tooltips_enable(tooltips);
-#endif
-
 	/* Feed title */
 	titleframe = gtk_frame_new(NULL);
 	gtk_container_set_border_width(GTK_CONTAINER(titleframe), 5);
@@ -77,15 +69,9 @@ void rssyl_subscribe_dialog(RSubCtx *ctx) {
 	title = gtk_entry_new();
 	gtk_entry_set_text(GTK_ENTRY(title), feed_get_title(ctx->feed));
 	gtk_entry_set_activates_default(GTK_ENTRY(title), TRUE);
-#if !(GTK_CHECK_VERSION(2, 12, 0))
-	gtk_tooltips_set_tip(tooltips, title,
-			_("Instead of using official title, you can enter a different folder "
-				"name for the feed."), NULL);
-#else
 	gtk_widget_set_tooltip_text(title,
 			_("Instead of using official title, you can enter a different folder "
 				"name for the feed."));
-#endif
 	gtk_container_add(GTK_CONTAINER(titleframe), title);
 
 	editprops = gtk_check_button_new_with_mnemonic(_("_Edit feed properties after subscribing"));

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail