[Commits] [SCM] claws branch, master, updated. 3.17.4-92-g7fb7227ca

[paul at claws-mail.org]

The branch, master has been updated
       via  7fb7227cac8823bd7ae350e92eb43871b53712a8 (commit)
       via  53861818806646f8d52498c2f05d228657b600ad (commit)
      from  ed7643486d1e3af87b3b820a5833f4e8f10d551e (commit)

Summary of changes:
 src/foldersel.c | 29 +++++++++++++++--------------
 src/gtk/about.c |  6 +++---
 2 files changed, 18 insertions(+), 17 deletions(-)


- Log -----------------------------------------------------------------
commit 7fb7227cac8823bd7ae350e92eb43871b53712a8
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 11 13:10:34 2020 +0000

    fix bug 4305, 'goto folder UI confusing'

diff --git a/src/foldersel.c b/src/foldersel.c
index 27d446945..eedfd03e3 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2018 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2020 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,7 +68,8 @@ static GdkPixbuf *foldernoselectopen_pixbuf = NULL;
 
 static GtkWidget *window;
 static GtkWidget *treeview;
-static GtkWidget *entry;
+static GtkWidget *statusbar;
+static gint statusbar_cid;
 static GtkWidget *ok_button;
 static GtkWidget *cancel_button;
 static GtkWidget *new_button;
@@ -336,10 +337,11 @@ static void foldersel_create(const gchar *title)
 
 	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
 
-	entry = gtk_entry_new();
-	gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE);
-	gtk_box_pack_start(GTK_BOX(vbox), entry, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(entry), "activate",
+	statusbar = gtk_statusbar_new();
+	statusbar_cid = gtk_statusbar_get_context_id(
+		        GTK_STATUSBAR(statusbar), "Select Folder Dialog" );
+	gtk_box_pack_start(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(statusbar), "activate",
 			 G_CALLBACK(foldersel_entry_activated), NULL);
 
 	gtkut_stock_button_set_create(&confirm_area,
@@ -521,18 +523,17 @@ static gboolean foldersel_selected(GtkTreeSelection *selection,
 	if (selected_item && selected_item->path) {
 		gchar *id;
 		id = folder_item_get_identifier(selected_item);
-		gtk_entry_set_text(GTK_ENTRY(entry), id);
+		gtk_statusbar_push(GTK_STATUSBAR(statusbar), statusbar_cid, id);
 		g_free(id);
-	} else
-	if (root_selectable && selected_item && selected_item->folder &&
-			(FOLDER_TYPE(selected_item->folder) == F_MH ||
-			 FOLDER_TYPE(selected_item->folder) == F_MBOX ||
-			 FOLDER_TYPE(selected_item->folder) == F_IMAP)) {
+	} else if (root_selectable && selected_item && selected_item->folder &&
+		   (FOLDER_TYPE(selected_item->folder) == F_MH ||
+		    FOLDER_TYPE(selected_item->folder) == F_MBOX ||
+		    FOLDER_TYPE(selected_item->folder) == F_IMAP)) {
 		gchar *id = folder_get_identifier(selected_item->folder);
-		gtk_entry_set_text(GTK_ENTRY(entry), id);
+		gtk_statusbar_push(GTK_STATUSBAR(statusbar), statusbar_cid,  id);
 		g_free(id);
 	} else
-		gtk_entry_set_text(GTK_ENTRY(entry), "");
+		gtk_statusbar_push(GTK_STATUSBAR(statusbar), statusbar_cid, "");
 
 	return TRUE;
 }

commit 53861818806646f8d52498c2f05d228657b600ad
Author: Paul <paul at claws-mail.org>
Date:   Tue Feb 11 13:09:58 2020 +0000

    update to 2020

diff --git a/src/gtk/about.c b/src/gtk/about.c
index b613d2c1e..2f81a4eae 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2019 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2020 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -160,7 +160,7 @@ static GtkWidget *about_create_child_page_info(void)
 				NULL);
 #ifdef GENERIC_UMPC
 	ADD_TEXT("\n\n");
-	ADD_TEXT(_("Copyright (C) 1999-2019\nThe Claws Mail Team\n"
+	ADD_TEXT(_("Copyright (C) 1999-2020\nThe Claws Mail Team\n"
 				"and Hiroyuki Yamamoto"));
 #endif
 	ADD_TEXT("\n\n");
@@ -849,7 +849,7 @@ static void about_create(void)
 	gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
 #ifndef GENERIC_UMPC
 	label = gtk_label_new
-		(_("Copyright (C) 1999-2019\nThe Claws Mail Team\n"
+		(_("Copyright (C) 1999-2020\nThe Claws Mail Team\n"
 		 "and Hiroyuki Yamamoto"));
 	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
 	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);

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


hooks/post-receive
-- 
Claws Mail