[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-854-g9a67445c1

paul at claws-mail.org paul at claws-mail.org
Fri Nov 22 13:53:09 CET 2019


The branch, gtk3 has been updated
       via  9a67445c1f14544cd470900296c120fe40be46d9 (commit)
       via  6349de35413165245b73022b83329e3fdcc89da4 (commit)
      from  a374abd697ebc61c6a488868a15ea32e2d29bcee (commit)

Summary of changes:
 src/gtk/menu.h   | 6 ------
 src/mainwindow.c | 8 ++++----
 src/mimeview.c   | 4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit 9a67445c1f14544cd470900296c120fe40be46d9
Author: paul <paul at claws-mail.org>
Date:   Fri Nov 22 13:53:02 2019 +0000

    remove menu_button_position(), no longer used

diff --git a/src/gtk/menu.h b/src/gtk/menu.h
index 2e4a58ca5..cfdff872e 100644
--- a/src/gtk/menu.h
+++ b/src/gtk/menu.h
@@ -98,12 +98,6 @@ gint menu_find_option_menu_index(GtkCMOptionMenu *optmenu, gpointer data,
 				 GCompareFunc func);
 #endif
 
-void menu_button_position	(GtkMenu		*menu,
-				 gint			*x,
-				 gint			*y,
-				 gboolean		*push_in,
-				 gpointer		 user_data);
-
 void menu_set_sensitive_all(GtkMenuShell *menu_shell, gboolean sensitive);
 
 #endif /* __MENU_H__ */

commit 6349de35413165245b73022b83329e3fdcc89da4
Author: paul <paul at claws-mail.org>
Date:   Fri Nov 22 13:50:51 2019 +0000

    fix incompatible pointer type warnings

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 86ec401e5..33ad22f46 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2760,10 +2760,10 @@ void main_window_toggle_message_view(MainWindow *mainwin)
 	}
 
 	if (messageview_is_visible(mainwin->messageview))
-		 gtk_image_set_from_icon_name(mainwin->summaryview->toggle_arrow,
+		 gtk_image_set_from_icon_name(GTK_IMAGE(mainwin->summaryview->toggle_arrow),
 					      "pan-down-symbolic", GTK_ICON_SIZE_MENU);
 	else
-		gtk_image_set_from_icon_name(mainwin->summaryview->toggle_arrow,
+		gtk_image_set_from_icon_name(GTK_IMAGE(mainwin->summaryview->toggle_arrow),
 					     "pan-up-symbolic", GTK_ICON_SIZE_MENU);;
 
 	if (mainwin->messageview->visible == FALSE)
@@ -3783,10 +3783,10 @@ static void main_window_set_widgets(MainWindow *mainwin, LayoutType layout_mode)
 				  prefs_common.display_header_pane);
 
 	if (messageview_is_visible(mainwin->messageview))
-		gtk_image_set_from_icon_name(mainwin->summaryview->toggle_arrow,
+		gtk_image_set_from_icon_name(GTK_IMAGE(mainwin->summaryview->toggle_arrow),
 					      "pan-down-symbolic", GTK_ICON_SIZE_MENU);
 	else
-		gtk_image_set_from_icon_name(mainwin->summaryview->toggle_arrow,
+		gtk_image_set_from_icon_name(GTK_IMAGE(mainwin->summaryview->toggle_arrow),
 					      "pan-up-symbolic", GTK_ICON_SIZE_MENU);
 
 	gtk_window_move(GTK_WINDOW(mainwin->window),
diff --git a/src/mimeview.c b/src/mimeview.c
index 2e1057198..25fe562d6 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -2814,7 +2814,7 @@ static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
 
 	mimeview->ctree_mode = !mimeview->ctree_mode;
 	if (mimeview->ctree_mode) {
-		gtk_image_set_from_icon_name(mimeview->arrow,
+		gtk_image_set_from_icon_name(GTK_IMAGE(mimeview->arrow),
 					      "pan-end-symbolic", GTK_ICON_SIZE_MENU);
 		gtk_widget_hide(mimeview->icon_mainbox);
 		gtk_widget_show(mimeview->ctree_mainbox);
@@ -2826,7 +2826,7 @@ static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
 		gtk_box_pack_end(GTK_BOX(mimeview->ctree_mainbox), 
 				   button, FALSE, FALSE, 0);
 	} else {
-		gtk_image_set_from_icon_name(mimeview->arrow,
+		gtk_image_set_from_icon_name(GTK_IMAGE(mimeview->arrow),
 					      "pan-start-symbolic", GTK_ICON_SIZE_MENU);
 		gtk_widget_hide(mimeview->ctree_mainbox);
 		gtk_widget_show(mimeview->icon_mainbox);

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list