[balsa/popover: 12/63] Bump Gtk requirement to 3.22
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/popover: 12/63] Bump Gtk requirement to 3.22
- Date: Sun, 5 Jul 2020 20:46:32 +0000 (UTC)
commit 6123e4ecb2730e2c37c864f7a1bf48d0f7abf7f8
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Wed May 6 22:00:32 2020 -0400
Bump Gtk requirement to 3.22
* configure.ac:
* libbalsa/identity.c (help_ident_cb):
* libbalsa/mime.c (is_in_url):
* libbalsa/misc.c (libbalsa_font_string_to_css):
* libbalsa/smtp-server.c (smtp_server_response):
* meson.build:
* src/address-book-config.c (help_button_cb):
* src/balsa-index.c (bndx_do_popup):
* src/balsa-mblist.c (bmbl_do_popup):
* src/balsa-message.c (balsa_headers_attachments_popup),
(tree_mult_selection_popup), (tree_button_press_cb):
* src/balsa-mime-widget-image.c (balsa_image_button_press_cb):
* src/balsa-mime-widget-message.c (extbody_call_url):
* src/balsa-mime-widget-text.c (balsa_mime_widget_new_text),
(handle_url):
* src/filter-edit-callbacks.c (condition_dialog_response),
(fe_dialog_response):
* src/filter-run-callbacks.c (fr_dialog_response):
* src/folder-conf.c (folder_conf_response):
* src/main-window.c (help_activated), (bw_notebook_label_new),
(bw_find_real):
* src/pref-manager.c (balsa_help_pbox_display), (add_menu_cb):
* src/sendmsg-window.c (change_attach_mode),
(attachment_menu_vfs_cb), (on_open_url_cb),
(attachment_button_press_cb), (attachment_popup_cb),
(create_text_area):
* src/toolbar-factory.c (tm_popup_context_menu_cb):
* src/toolbar-prefs.c (tp_dialog_response_cb):
ChangeLog | 34 +++++++++++++++++++++++++++++++++-
configure.ac | 2 +-
src/sendmsg-window.c | 12 ------------
src/toolbar-factory.c | 1 -
4 files changed, 34 insertions(+), 15 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ab0deb184..3544626bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -409,12 +409,44 @@
* NEWS, configure.ac, meson.build: release balsa-2.6.1
-
2020-05-06 Peter Bloomfield <pbloomfield bellsouth net>
* src/sendmsg-window.c (add_attachment): Insert separators
between logically distinct sections of the popup menu.
+2020-05-06 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Bump Gtk requirement to 3.22
+
+ * configure.ac:
+ * libbalsa/identity.c (help_ident_cb):
+ * libbalsa/mime.c (is_in_url):
+ * libbalsa/misc.c (libbalsa_font_string_to_css):
+ * libbalsa/smtp-server.c (smtp_server_response):
+ * meson.build:
+ * src/address-book-config.c (help_button_cb):
+ * src/balsa-index.c (bndx_do_popup):
+ * src/balsa-mblist.c (bmbl_do_popup):
+ * src/balsa-message.c (balsa_headers_attachments_popup),
+ (tree_mult_selection_popup), (tree_button_press_cb):
+ * src/balsa-mime-widget-image.c (balsa_image_button_press_cb):
+ * src/balsa-mime-widget-message.c (extbody_call_url):
+ * src/balsa-mime-widget-text.c (balsa_mime_widget_new_text),
+ (handle_url):
+ * src/filter-edit-callbacks.c (condition_dialog_response),
+ (fe_dialog_response):
+ * src/filter-run-callbacks.c (fr_dialog_response):
+ * src/folder-conf.c (folder_conf_response):
+ * src/main-window.c (help_activated), (bw_notebook_label_new),
+ (bw_find_real):
+ * src/pref-manager.c (balsa_help_pbox_display), (add_menu_cb):
+ * src/sendmsg-window.c (change_attach_mode),
+ (attachment_menu_vfs_cb), (on_open_url_cb),
+ (attachment_button_press_cb), (attachment_popup_cb),
+ (create_text_area):
+ * src/toolbar-factory.c (tm_popup_context_menu_cb):
+ * src/toolbar-prefs.c (tp_dialog_response_cb):
+
2020-04-11 Pawel Salek <pawsa0 gmail com>
* NEWS, configure.ac, meson.build: release balsa-2.6.0
diff --git a/configure.ac b/configure.ac
index 555a57582..5538e702f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,7 +235,7 @@ libical >= 2.0.0
PKG_CHECK_MODULES(BALSA_AB, [
glib-2.0
- gtk+-3.0
+ gtk+-3.0 >= 3.22.0
gmime-3.0 >= 3.2.6
])
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 01654479c..31a22e0be 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1365,11 +1365,7 @@ change_attach_mode(GSimpleAction *action,
result = gtk_dialog_run(GTK_DIALOG(extbody_dialog));
gtk_widget_destroy(extbody_dialog);
if (result != GTK_RESPONSE_YES) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popdown(GTK_POPOVER(info->popup_menu));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_hide(info->popup_menu);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
return;
}
@@ -1380,11 +1376,7 @@ change_attach_mode(GSimpleAction *action,
gtk_list_store_set(GTK_LIST_STORE(model), &iter, ATTACH_MODE_COLUMN,
info->mode, -1);
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popdown(GTK_POPOVER(info->popup_menu));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_hide(info->popup_menu);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
g_simple_action_set_state(action, parameter);
}
@@ -1408,11 +1400,7 @@ attachment_menu_vfs_cb(GSimpleAction *action,
err ? err->message : "Unknown error");
g_clear_error(&err);
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popdown(GTK_POPOVER(info->popup_menu));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_hide(info->popup_menu);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index 06bb446fe..6c5a0dc38 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -623,7 +623,6 @@ tm_remove_underscore(const gchar * text)
return r;
}
-
static gboolean
tm_popup_context_menu_cb(GtkWidget * toolbar,
gint x,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]