[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-372-g4844c6a

[ticho at claws-mail.org]

The branch, gtk3 has been updated
       via  4844c6abcebf4f6f4b254877c6600dac8b23dbbc (commit)
       via  4586940f8a723669a61c5bfc7e91c7b48da49f75 (commit)
      from  b983c7d3c93781cd5472ba183d02a197dbaa7694 (commit)

Summary of changes:
 src/plugins/rssyl/rssyl_cb_menu.c    |   11 +++--------
 src/plugins/rssyl/rssyl_feed_props.c |    2 +-
 src/plugins/rssyl/rssyl_prefs.c      |    2 +-
 src/plugins/vcalendar/vcal_prefs.c   |    2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)


- Log -----------------------------------------------------------------
commit 4844c6abcebf4f6f4b254877c6600dac8b23dbbc
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Oct 4 20:32:05 2018 +0200

    Use correct type for GtkAdjustments in RSSyl and Vcalendar.

diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index 35dc38d..096cbbf 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -246,7 +246,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
 		*bbox, *cancel_button, *cancel_align,
 		*cancel_hbox, *cancel_image, *cancel_label, *ok_button, *ok_align,
 		*ok_hbox, *ok_image, *ok_label, *trim_button, *silent_update_label;
-	GObject *adj;
+	GtkAdjustment *adj;
 	gint refresh;
 
 	g_return_if_fail(ritem != NULL);
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index d0e0ac3..7fc4478 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -129,7 +129,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
 	GtkWidget *refresh, *refresh_enabled, *refresh_hbox;
 	GtkWidget *label;
 	GtkWidget *refresh_on_startup;
-	GObject *refresh_adj;
+	GtkAdjustment *refresh_adj;
 	GtkWidget *cookies_path, *cookies_btn, *cookies_hbox;
 	GtkWidget *ssl_verify_peer;
 
diff --git a/src/plugins/vcalendar/vcal_prefs.c b/src/plugins/vcalendar/vcal_prefs.c
index 4aa1c99..5f78671 100644
--- a/src/plugins/vcalendar/vcal_prefs.c
+++ b/src/plugins/vcalendar/vcal_prefs.c
@@ -249,7 +249,7 @@ static void vcal_prefs_create_widget_func(PrefsPage * _page,
 	
 	GtkWidget *frame_alert;
 	GtkWidget *alert_enable_checkbtn;
-	GObject *alert_enable_spinbtn_adj;
+	GtkAdjustment *alert_enable_spinbtn_adj;
 	GtkWidget *alert_enable_h_spinbtn;
 	GtkWidget *alert_enable_m_spinbtn;
 	GtkWidget *label_alert_enable;

commit 4586940f8a723669a61c5bfc7e91c7b48da49f75
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Oct 4 20:25:53 2018 +0200

    Do not use trim_string() in RSSyl's rename folder dialog.

diff --git a/src/plugins/rssyl/rssyl_cb_menu.c b/src/plugins/rssyl/rssyl_cb_menu.c
index 79e70ea..71bd27b 100644
--- a/src/plugins/rssyl/rssyl_cb_menu.c
+++ b/src/plugins/rssyl/rssyl_cb_menu.c
@@ -185,7 +185,6 @@ void rssyl_rename_cb(GtkAction *action,
 {
 	FolderItem *item;
 	gchar *new_folder;
-	gchar *name;
 	gchar *message;
 	FolderView *folderview = (FolderView*)data;
 	item = folderview_get_selected_item(folderview);
@@ -193,11 +192,9 @@ void rssyl_rename_cb(GtkAction *action,
 	g_return_if_fail(item->path != NULL);
 	g_return_if_fail(item->folder != NULL);
 
-	name = trim_string(item->name, 32);
-	message = g_strdup_printf(_("Input new name for '%s':"), name);
-	new_folder = input_dialog(_("Rename folder"), message, name);
+	message = g_strdup_printf(_("Input new name for '%s':"), item->name);
+	new_folder = input_dialog(_("Rename folder"), message, item->name);
 	g_free(message);
-	g_free(name);
 	if (!new_folder) return;
 
 	if (strchr(new_folder, G_DIR_SEPARATOR) != NULL) {
@@ -213,9 +210,7 @@ void rssyl_rename_cb(GtkAction *action,
 	}
 
 	if (folder_find_child_item_by_name(folder_item_parent(item), new_folder)) {
-		name = trim_string(new_folder, 32);
-		alertpanel_error(_("The folder '%s' already exists."), name);
-		g_free(name);
+		alertpanel_error(_("The folder '%s' already exists."), new_folder);
 		g_free(new_folder);
 		return;
 	}

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


hooks/post-receive
-- 
Claws Mail