[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-537-g51df50b

ticho at claws-mail.org ticho at claws-mail.org
Thu Dec 20 01:01:06 CET 2018


The branch, gtk3 has been updated
       via  51df50ba2a8cb6dd3af2d753ef09bbec96b56327 (commit)
      from  cf0873c955328e729829bd15add5eed6f6ba8e48 (commit)

Summary of changes:
 src/action.c    |    6 +-----
 src/main.c      |   12 ------------
 src/statusbar.c |    4 ----
 3 files changed, 1 insertion(+), 21 deletions(-)


- Log -----------------------------------------------------------------
commit 51df50ba2a8cb6dd3af2d753ef09bbec96b56327
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Dec 20 01:00:04 2018 +0100

    Remove a few more #if !GTK_CHECK_VERSION(3, 0, 0) blocks

diff --git a/src/action.c b/src/action.c
index cea5410..8a6e76d 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1374,15 +1374,11 @@ static void create_io_dialog(Children *children)
 #endif
 		
 		progress_bar = gtk_progress_bar_new();
-#if !GTK_CHECK_VERSION(3, 0, 0)
-		gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(progress_bar),
-				GTK_PROGRESS_LEFT_TO_RIGHT);
-#else
 		gtk_orientable_set_orientation(GTK_ORIENTABLE(progress_bar),
 				GTK_ORIENTATION_HORIZONTAL);
 		gtk_progress_bar_set_inverted(GTK_PROGRESS_BAR(progress_bar),
 				FALSE);
-#endif
+
 		text = g_strdup_printf(format, _("Completed"), 
 		                       children->initial_nb);
 		gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress_bar),
diff --git a/src/main.c b/src/main.c
index 0241d1e..ee1dade 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1036,9 +1036,6 @@ int main(int argc, char *argv[])
 
 #ifdef CRASH_DIALOG
 	if (cmd.crash) {
-#if !GTK_CHECK_VERSION(3, 0, 0)
-		gtk_set_locale();
-#endif
 		gtk_init(&argc, &argv);
 		crash_main(cmd.crash_params);
 #ifdef G_OS_WIN32
@@ -1071,9 +1068,6 @@ int main(int argc, char *argv[])
 
 	reset_statistics();
 	
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	gtk_set_locale();
-#endif
 	gtk_init(&argc, &argv);
 
 #ifdef G_OS_WIN32
@@ -1120,12 +1114,6 @@ int main(int argc, char *argv[])
 	}
 #endif
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	gtk_widget_set_default_colormap(
-		gdk_screen_get_system_colormap(
-			gdk_screen_get_default()));
-#endif
-
 	gtkut_create_ui_manager();
 
 	/* Create container for all the menus we will be adding */
diff --git a/src/statusbar.c b/src/statusbar.c
index ca22493..68070ce 100644
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -48,10 +48,6 @@ GtkWidget *statusbar_create(void)
 
 	statusbar = gtk_statusbar_new();
 	statusbar_list = g_list_append(statusbar_list, statusbar);
-#if !GTK_CHECK_VERSION(3, 0, 0)
-	gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusbar), 
-					  FALSE);
-#endif
 	gtk_container_set_border_width(GTK_CONTAINER(statusbar), 1);
 	child = gtk_statusbar_get_message_area(GTK_STATUSBAR(statusbar));
 	parent = gtk_widget_get_parent(child);

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list