From 43782fd2ee8fe6c60a64d766368254203359ae78 Mon Sep 17 00:00:00 2001 From: monsta Date: Sun, 28 Jan 2018 20:22:11 +0300 Subject: require GTK+ 3.22 and GLib 2.50 --- configure.ac | 6 +++--- src/dlg-add-folder.c | 12 ------------ src/dlg-extract.c | 8 -------- src/fr-window.c | 17 ----------------- src/gtk-utils.c | 13 ------------- 5 files changed, 3 insertions(+), 53 deletions(-) diff --git a/configure.ac b/configure.ac index 11eb192..f36bfbb 100644 --- a/configure.ac +++ b/configure.ac @@ -29,9 +29,9 @@ dnl it too, or it will never make it into the spec file! dnl dnl ========================================================================== -GLIB_REQUIRED=2.32.0 -GIO_REQUIRED=2.25.5 -GTK_REQUIRED=3.14.0 +GLIB_REQUIRED=2.50.0 +GIO_REQUIRED=2.50.0 +GTK_REQUIRED=3.22.0 CAJA_REQUIRED=1.17.1 JSON_GLIB_REQUIRED=0.14.0 diff --git a/src/dlg-add-folder.c b/src/dlg-add-folder.c index 158703f..b214061 100644 --- a/src/dlg-add-folder.c +++ b/src/dlg-add-folder.c @@ -244,31 +244,19 @@ add_folder_cb (GtkWidget *widget, data->include_files_entry = gtk_entry_new (); gtk_widget_set_tooltip_text (data->include_files_entry, _("example: *.o; *.bak")); data->include_files_label = gtk_label_new_with_mnemonic (_("Include _files:")); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (data->include_files_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (data->include_files_label), 0.0, 0.5); -#endif gtk_label_set_mnemonic_widget (GTK_LABEL (data->include_files_label), data->include_files_entry); data->exclude_files_entry = gtk_entry_new (); gtk_widget_set_tooltip_text (data->exclude_files_entry, _("example: *.o; *.bak")); data->exclude_files_label = gtk_label_new_with_mnemonic (_("E_xclude files:")); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (data->exclude_files_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (data->exclude_files_label), 0.0, 0.5); -#endif gtk_label_set_mnemonic_widget (GTK_LABEL (data->exclude_files_label), data->exclude_files_entry); data->exclude_folders_entry = gtk_entry_new (); gtk_widget_set_tooltip_text (data->exclude_folders_entry, _("example: *.o; *.bak")); data->exclude_folders_label = gtk_label_new_with_mnemonic (_("_Exclude folders:")); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (data->exclude_folders_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (data->exclude_folders_label), 0.0, 0.5); -#endif gtk_label_set_mnemonic_widget (GTK_LABEL (data->exclude_folders_label), data->exclude_folders_entry); data->load_button = gtk_button_new_with_mnemonic (_("_Load Options")); diff --git a/src/dlg-extract.c b/src/dlg-extract.c index 27217d2..2067c15 100644 --- a/src/dlg-extract.c +++ b/src/dlg-extract.c @@ -333,11 +333,7 @@ create_extra_widget (DialogData *data) set_bold_label (e_files_label, _("Extract")); gtk_box_pack_start (GTK_BOX (vbox19), e_files_label, FALSE, FALSE, 0); gtk_label_set_justify (GTK_LABEL (e_files_label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (e_files_label), 0); -#else - gtk_misc_set_alignment (GTK_MISC (e_files_label), 0, 0.5); -#endif hbox29 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (vbox19), hbox29, TRUE, TRUE, 0); @@ -379,11 +375,7 @@ create_extra_widget (DialogData *data) gtk_box_pack_start (GTK_BOX (vbox20), e_actions_label, FALSE, FALSE, 0); gtk_label_set_use_markup (GTK_LABEL (e_actions_label), TRUE); gtk_label_set_justify (GTK_LABEL (e_actions_label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (e_actions_label), 0); -#else - gtk_misc_set_alignment (GTK_MISC (e_actions_label), 0, 0.5); -#endif hbox30 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start (GTK_BOX (vbox20), hbox30, TRUE, TRUE, 0); diff --git a/src/fr-window.c b/src/fr-window.c index 0dbd135..3c14824 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -2253,13 +2253,8 @@ open_folder (GtkWindow *parent, if (folder == NULL) return; -#if GTK_CHECK_VERSION (3, 22, 0) if (! gtk_show_uri_on_window (parent, folder, GDK_CURRENT_TIME, &error)) { GtkWidget *d; -#else - if (! gtk_show_uri (gtk_window_get_screen (parent), folder, GDK_CURRENT_TIME, &error)) { - GtkWidget *d; -#endif char *utf8_name; char *message; @@ -2567,11 +2562,7 @@ create_the_progress_dialog (FrWindow *window) gtk_widget_set_vexpand (lbl, TRUE); gtk_widget_set_margin_bottom (lbl, 12); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (lbl), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5); -#endif gtk_label_set_ellipsize (GTK_LABEL (lbl), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (vbox), lbl, TRUE, TRUE, 0); @@ -2607,11 +2598,7 @@ create_the_progress_dialog (FrWindow *window) gtk_label_set_attributes (GTK_LABEL (lbl), attr_list); pango_attr_list_unref (attr_list); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (lbl), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5); -#endif gtk_label_set_ellipsize (GTK_LABEL (lbl), PANGO_ELLIPSIZE_END); gtk_box_pack_start (GTK_BOX (progress_vbox), lbl, TRUE, TRUE, 0); @@ -5843,11 +5830,7 @@ fr_window_construct (FrWindow *window) gtk_container_add (GTK_CONTAINER (sidepane_title), sidepane_title_box); sidepane_title_label = gtk_label_new (_("Folders")); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (sidepane_title_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (sidepane_title_label), 0.0, 0.5); -#endif gtk_box_pack_start (GTK_BOX (sidepane_title_box), sidepane_title_label, TRUE, TRUE, 0); close_sidepane_button = gtk_button_new (); diff --git a/src/gtk-utils.c b/src/gtk-utils.c index 10b6ecf..6c3428b 100644 --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -214,12 +214,8 @@ _gtk_request_dialog_run (GtkWindow *parent, label = gtk_label_new_with_mnemonic (message); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_selectable (GTK_LABEL (label), FALSE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -#endif entry = gtk_entry_new (); gtk_entry_set_width_chars (GTK_ENTRY (entry), 50); @@ -386,12 +382,8 @@ _gtk_error_dialog_new (GtkWindow *parent, label = gtk_label_new (""); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_selectable (GTK_LABEL (label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_label_set_yalign (GTK_LABEL (label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -#endif escaped_message = g_markup_escape_text (primary_text, -1); if (secondary_text != NULL) { @@ -739,13 +731,8 @@ show_help_dialog (GtkWindow *parent, GError *error = NULL; uri = g_strconcat ("help:engrampa", section ? "/" : NULL, section, NULL); -#if GTK_CHECK_VERSION (3, 22, 0) if (! gtk_show_uri_on_window (parent, uri, GDK_CURRENT_TIME, &error)) { GtkWidget *dialog; -#else - if (! gtk_show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) { - GtkWidget *dialog; -#endif dialog = _gtk_message_dialog_new (parent, GTK_DIALOG_DESTROY_WITH_PARENT, -- cgit v1.2.1