[balsa/popover: 12/19] Bump Gtk requirement to 3.22
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/popover: 12/19] Bump Gtk requirement to 3.22
- Date: Mon, 11 May 2020 20:20:36 +0000 (UTC)
commit 2a55cfd717cab9580e3af367b79301d2cca9446f
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 | 4 ++--
libbalsa/identity.c | 8 -------
libbalsa/mime.c | 5 ----
libbalsa/misc.c | 7 ------
libbalsa/smtp-server.c | 10 --------
meson.build | 2 +-
src/address-book-config.c | 8 -------
src/balsa-index.c | 4 ----
src/balsa-mblist.c | 19 ---------------
src/balsa-message.c | 22 -----------------
src/balsa-mime-widget-image.c | 5 ----
src/balsa-mime-widget-message.c | 9 -------
src/balsa-mime-widget-text.c | 14 +++--------
src/filter-edit-callbacks.c | 18 --------------
src/filter-run-callbacks.c | 9 -------
src/folder-conf.c | 9 -------
src/main-window.c | 22 -----------------
src/pref-manager.c | 13 -----------
src/sendmsg-window.c | 35 +++------------------------
src/toolbar-factory.c | 52 -----------------------------------------
src/toolbar-prefs.c | 9 -------
22 files changed, 42 insertions(+), 276 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 652a9b7af..8ad902bee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,12 +7,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 36c091666..fae1c841a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,7 +224,7 @@ dnl #####################################################################
PKG_CHECK_MODULES(BALSA, [
glib-2.0 >= 2.48.0
-gtk+-3.0 >= 3.18.0
+gtk+-3.0 >= 3.22.0
gmime-3.0 >= 3.2.6
gio-2.0
gthread-2.0
@@ -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/libbalsa/identity.c b/libbalsa/identity.c
index 26d362341..448296e33 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -1602,17 +1602,9 @@ static void
help_ident_cb(GtkWidget * widget)
{
GError *err = NULL;
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(widget), "help:balsa/identities",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- GdkScreen *screen;
-
- screen = gtk_widget_get_screen(widget);
- gtk_show_uri(screen, "help:balsa/identities",
- gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
g_print(_("Error displaying help for identities: %s\n"),
diff --git a/libbalsa/mime.c b/libbalsa/mime.c
index a31fea10b..c742bbada 100644
--- a/libbalsa/mime.c
+++ b/libbalsa/mime.c
@@ -659,13 +659,8 @@ static gboolean
is_in_url(GtkTextIter * iter, gint offset, GtkTextTag * url_tag)
{
gtk_text_iter_set_line_offset(iter, offset);
-#if GTK_CHECK_VERSION(3, 19, 0)
return url_tag ? (gtk_text_iter_has_tag(iter, url_tag)
&& !gtk_text_iter_starts_tag(iter, url_tag)) : FALSE;
-#else /* GTK_CHECK_VERSION(3, 20, 0) */
- return url_tag ? (gtk_text_iter_has_tag(iter, url_tag)
- && !gtk_text_iter_begins_tag(iter, url_tag)) : FALSE;
-#endif /* GTK_CHECK_VERSION(3, 20, 0) */
}
/* Remove soft newlines and associated quote strings from num_paras
diff --git a/libbalsa/misc.c b/libbalsa/misc.c
index dd8f554b7..ffe31d7f9 100644
--- a/libbalsa/misc.c
+++ b/libbalsa/misc.c
@@ -1156,12 +1156,6 @@ gchar *
libbalsa_font_string_to_css(const gchar * font_string,
const gchar * name)
{
-#if !GTK_CHECK_VERSION(3, 22,0)
- g_return_val_if_fail(font_string != NULL, NULL);
- g_return_val_if_fail(name != NULL, NULL);
-
- return g_strconcat("#", name, " {font:", font_string, "}", NULL);
-#else /* !GTK_CHECK_VERSION(3, 22,0) */
PangoFontDescription *desc;
PangoFontMask mask;
GString *string;
@@ -1239,7 +1233,6 @@ libbalsa_font_string_to_css(const gchar * font_string,
pango_font_description_free(desc);
return g_string_free(string, FALSE);
-#endif /* !GTK_CHECK_VERSION(3, 22,0) */
}
static GMimeParserOptions *parser_options;
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index 31d8181ea..a0ca8dd7c 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -233,24 +233,14 @@ static void
smtp_server_response(GtkDialog * dialog, gint response,
struct smtp_server_dialog_info *sdi)
{
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
LibBalsaServer *server = LIBBALSA_SERVER(sdi->smtp_server);
GError *error = NULL;
switch (response) {
case GTK_RESPONSE_HELP:
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(dialog),
"help:balsa/preferences-mail-options#smtp-server-config",
gtk_get_current_event_time(), &error);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(GTK_WIDGET(dialog));
- gtk_show_uri(screen,
- "help:balsa/preferences-mail-options#smtp-server-config",
- gtk_get_current_event_time(), &error);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (error) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error displaying server help: %s\n"),
diff --git a/meson.build b/meson.build
index f63e2dab1..8a6b96845 100644
--- a/meson.build
+++ b/meson.build
@@ -129,7 +129,7 @@ conf.set('TOOLKIT_CATEGORIES', TOOLKIT_CATEGORIES)
# Dependencies for balsa and balsa_ab:
glib_dep = dependency('glib-2.0', version : '>= 2.48.0')
-gtk_dep = dependency('gtk+-3.0', version : '>= 3.18.0')
+gtk_dep = dependency('gtk+-3.0', version : '>= 3.22.0')
gmime_dep = dependency('gmime-3.0', version : '>= 3.2.6')
gio_dep = dependency('gio-2.0')
gthread_dep = dependency('gthread-2.0')
diff --git a/src/address-book-config.c b/src/address-book-config.c
index e86496ce2..e40b3003f 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -593,18 +593,10 @@ static void
help_button_cb(AddressBookConfig * abc)
{
GError *err = NULL;
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(abc->window),
"help:balsa/preferences-address-books",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- GdkScreen *screen;
-
- screen = gtk_widget_get_screen(abc->window);
- gtk_show_uri(screen, "help:balsa/preferences-address-books",
- gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
libbalsa_information(LIBBALSA_INFORMATION_WARNING,
diff --git a/src/balsa-index.c b/src/balsa-index.c
index 36b9d8e34..45dd9fea3 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -2078,11 +2078,7 @@ bndx_do_popup(BalsaIndex * index, GdkEventButton * event)
g_menu_remove(index->popup_menu, index->move_position);
g_menu_insert_item(index->popup_menu, index->move_position, item);
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popup(GTK_POPOVER(index->popup_popover));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_show_all(index->popup_popover);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
/* End of popup stuff */
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index 39305b28b..e16234cd6 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -711,10 +711,6 @@ bmbl_do_popup(GtkTreeView * tree_view, GtkTreePath * path,
GdkEventButton * event)
{
BalsaMailboxNode *mbnode = NULL;
-#if !GTK_CHECK_VERSION(3, 22, 0)
- gint event_button;
- guint event_time;
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
GtkWidget *menu;
if (path) {
@@ -726,30 +722,15 @@ bmbl_do_popup(GtkTreeView * tree_view, GtkTreePath * path,
gtk_tree_path_free(path);
}
-#if !GTK_CHECK_VERSION(3, 22, 0)
- if (event) {
- event_button = event->button;
- event_time = event->time;
- } else {
- event_button = 0;
- event_time = gtk_get_current_event_time();
- }
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
-
menu = balsa_mailbox_node_get_context_menu(mbnode);
g_object_ref(menu);
g_object_ref_sink(menu);
-#if GTK_CHECK_VERSION(3, 22, 0)
if (event)
gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent *) event);
else
gtk_menu_popup_at_widget(GTK_MENU(menu), GTK_WIDGET(tree_view),
GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER,
NULL);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
- event_button, event_time);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
g_object_unref(menu);
if (mbnode)
diff --git a/src/balsa-message.c b/src/balsa-message.c
index ba3aa0b4a..9a0614186 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -237,15 +237,10 @@ static void
balsa_headers_attachments_popup(GtkButton * button, BalsaMessage * balsa_message)
{
if (balsa_message->parts_popup) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_menu_popup_at_widget(GTK_MENU(balsa_message->parts_popup),
GTK_WIDGET(balsa_message),
GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER,
NULL);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_menu_popup(GTK_MENU(balsa_message->parts_popup), NULL, NULL, NULL, NULL, 0,
- gtk_get_current_event_time());
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
}
@@ -906,11 +901,7 @@ tree_mult_selection_popup(BalsaMessage * balsa_message, GdkEventButton * event,
if (selected == 1) {
BalsaPartInfo *info = BALSA_PART_INFO(balsa_message->save_all_list->data);
if (info->popup_menu != NULL) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popup(GTK_POPOVER(info->popup_menu));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_show_all(info->popup_menu);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
g_list_free(balsa_message->save_all_list);
balsa_message->save_all_list = NULL;
@@ -933,7 +924,6 @@ tree_mult_selection_popup(BalsaMessage * balsa_message, GdkEventButton * event,
G_CALLBACK (part_context_dump_all_cb),
(gpointer) balsa_message->save_all_list);
gtk_menu_shell_append (GTK_MENU_SHELL (balsa_message->save_all_popup), menu_item);
-#if GTK_CHECK_VERSION(3, 22, 0)
if (event)
gtk_menu_popup_at_pointer(GTK_MENU(balsa_message->save_all_popup),
(GdkEvent *) event);
@@ -942,14 +932,6 @@ tree_mult_selection_popup(BalsaMessage * balsa_message, GdkEventButton * event,
GTK_WIDGET(balsa_message),
GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER,
NULL);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- if (event)
- gtk_menu_popup(GTK_MENU(balsa_message->save_all_popup), NULL, NULL, NULL,
- NULL, event->button, event->time);
- else
- gtk_menu_popup(GTK_MENU(balsa_message->save_all_popup), NULL, NULL, NULL,
- NULL, 0, gtk_get_current_event_time());
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
}
@@ -1002,11 +984,7 @@ tree_button_press_cb(GtkWidget * widget, GdkEventButton * event,
gtk_tree_model_get(model, &iter, PART_INFO_COLUMN, &info, -1);
if (info != NULL) {
if (info->popup_menu != NULL) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popup(GTK_POPOVER(info->popup_menu));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_show_all(info->popup_menu);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
g_object_unref(info);
}
diff --git a/src/balsa-mime-widget-image.c b/src/balsa-mime-widget-image.c
index 7f148614e..64289484b 100644
--- a/src/balsa-mime-widget-image.c
+++ b/src/balsa-mime-widget-image.c
@@ -144,12 +144,7 @@ balsa_image_button_press_cb(GtkWidget * widget, GdkEventButton * event,
GtkMenu * menu)
{
if (gdk_event_triggers_context_menu((GdkEvent *) event)) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_menu_popup_at_pointer(menu, (GdkEvent *) event);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_menu_popup(menu, NULL, NULL, NULL, NULL,
- event->button, event->time);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
return TRUE;
} else
return FALSE;
diff --git a/src/balsa-mime-widget-message.c b/src/balsa-mime-widget-message.c
index ee0f7747d..b6d302a80 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -312,24 +312,15 @@ static void
extbody_call_url(GtkWidget * button, gpointer data)
{
gchar *url = g_object_get_data(G_OBJECT(button), "call_url");
-#if GTK_CHECK_VERSION(3, 22, 0)
GtkWidget *toplevel;
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
GError *err = NULL;
g_return_if_fail(url);
-#if GTK_CHECK_VERSION(3, 22, 0)
toplevel = gtk_widget_get_toplevel(GTK_WIDGET(button));
if (gtk_widget_is_toplevel(toplevel)) {
gtk_show_uri_on_window(GTK_WINDOW(toplevel), url,
gtk_get_current_event_time(), &err);
}
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(button);
- gtk_show_uri(screen, url, gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error showing %s: %s\n"), url, err->message);
diff --git a/src/balsa-mime-widget-text.c b/src/balsa-mime-widget-text.c
index 0ec38f20f..2a242426e 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -235,15 +235,15 @@ balsa_mime_widget_new_text(BalsaMessage * bm, LibBalsaMessageBody * mime_body,
/* configure text or source view */
gtk_text_view_set_editable(text_view, FALSE);
-#if GTK_CHECK_VERSION(3, 23, 1)
+#if GTK_CHECK_VERSION(3, 24, 0)
gtk_text_view_set_left_margin(text_view, BALSA_LEFT_MARGIN);
gtk_text_view_set_right_margin(text_view, BALSA_RIGHT_MARGIN);
-#else /* GTK_CHECK_VERSION(3, 23, 1) */
+#else /* GTK_CHECK_VERSION(3, 24, 0) */
gtk_text_view_set_left_margin(text_view, 0);
gtk_text_view_set_right_margin(text_view, 0);
gtk_widget_set_margin_start(widget, BALSA_LEFT_MARGIN);
gtk_widget_set_margin_end(widget, BALSA_RIGHT_MARGIN);
-#endif /* GTK_CHECK_VERSION(3, 23, 1) */
+#endif /* GTK_CHECK_VERSION(3, 24, 0) */
gtk_text_view_set_wrap_mode(text_view, GTK_WRAP_WORD_CHAR);
/* set the message font */
@@ -850,9 +850,6 @@ handle_url(const gchar * url)
GtkStatusbar *statusbar;
guint context_id;
gchar *notice = g_strdup_printf(_("Calling URL %s…"), url);
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
GError *err = NULL;
statusbar = balsa_window_get_statusbar(balsa_app.main_window);
@@ -862,13 +859,8 @@ handle_url(const gchar * url)
gtk_statusbar_push(statusbar, context_id, notice);
SCHEDULE_BAR_REFRESH();
g_free(notice);
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(balsa_app.main_window), url,
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(GTK_WIDGET(balsa_app.main_window));
- gtk_show_uri(screen, url, gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err != NULL) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index 9ce64bead..47fe0aec3 100644
--- a/src/filter-edit-callbacks.c
+++ b/src/filter-edit-callbacks.c
@@ -835,9 +835,6 @@ condition_dialog_response(GtkWidget * dialog, gint response,
{
LibBalsaCondition *new_cnd;
GError *err = NULL;
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
switch (response) {
case GTK_RESPONSE_OK: /* OK button */
@@ -893,15 +890,9 @@ condition_dialog_response(GtkWidget * dialog, gint response,
gtk_widget_hide(dialog);
break;
case GTK_RESPONSE_HELP: /* Help button */
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(dialog),
"help:balsa/win-filters#win-condition",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(dialog);
- gtk_show_uri(screen, "help:balsa/win-filters#win-condition",
- gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information_parented(GTK_WINDOW(dialog),
LIBBALSA_INFORMATION_WARNING,
@@ -1464,9 +1455,6 @@ fe_dialog_response(GtkWidget * dialog, gint response, gpointer data)
GtkTreeIter iter;
gboolean valid;
GError *err = NULL;
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
switch (response) {
case GTK_RESPONSE_OK: /* OK button */
@@ -1505,14 +1493,8 @@ fe_dialog_response(GtkWidget * dialog, gint response, gpointer data)
break;
case GTK_RESPONSE_HELP: /* Help button */
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(dialog), "help:balsa/win-filters",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(dialog);
- gtk_show_uri(screen, "help:balsa/win-filters",
- gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information_parented(GTK_WINDOW(dialog),
LIBBALSA_INFORMATION_WARNING,
diff --git a/src/filter-run-callbacks.c b/src/filter-run-callbacks.c
index 4e6d44f0e..db2930d56 100644
--- a/src/filter-run-callbacks.c
+++ b/src/filter-run-callbacks.c
@@ -162,9 +162,6 @@ void fr_dialog_response(GtkWidget * widget, gint response,
gpointer throwaway)
{
BalsaFilterRunDialog * p;
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
GError *err = NULL;
p=BALSA_FILTER_RUN_DIALOG(widget);
@@ -180,15 +177,9 @@ void fr_dialog_response(GtkWidget * widget, gint response,
break;
case GTK_RESPONSE_HELP: /* Help button */
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(widget),
"help:balsa/win-run-filters",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(widget);
- gtk_show_uri(screen, "help:balsa/win-run-filters",
- gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information_parented(GTK_WINDOW(widget),
LIBBALSA_INFORMATION_WARNING,
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 5d89a1234..c78c708ca 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -94,9 +94,6 @@ static void
folder_conf_response(GtkDialog * dialog, int response,
CommonDialogData * common_data)
{
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
GError *err = NULL;
/* If mbnode's parent gets rescanned, mbnode will be finalized,
@@ -107,14 +104,8 @@ folder_conf_response(GtkDialog * dialog, int response,
g_object_ref(common_data->mbnode);
switch (response) {
case GTK_RESPONSE_HELP:
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(dialog), "help:balsa/folder-config",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(GTK_WIDGET(dialog));
- gtk_show_uri(screen, "help:balsa/folder-config",
- gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error displaying config help: %s\n"),
diff --git a/src/main-window.c b/src/main-window.c
index 05b6cf404..70d927e18 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -993,19 +993,10 @@ help_activated(GSimpleAction * action,
gpointer user_data)
{
GtkWindow *window = GTK_WINDOW(user_data);
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
GError *err = NULL;
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(window, "help:balsa",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_window_get_screen(window);
- gtk_show_uri(screen, "help:balsa", gtk_get_current_event_time(),
- &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error displaying help: %s\n"), err->message);
@@ -2853,11 +2844,7 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
gtk_box_pack_start(GTK_BOX(box), lab, TRUE, TRUE, 0);
but = gtk_button_new();
-#if GTK_CHECK_VERSION(3, 19, 0)
gtk_widget_set_focus_on_click(but, FALSE);
-#else /* GTK_CHECK_VERSION(3, 20, 0) */
- gtk_button_set_focus_on_click(GTK_BUTTON(but), FALSE);
-#endif /* GTK_CHECK_VERSION(3, 20, 0) */
gtk_button_set_relief(GTK_BUTTON(but), GTK_RELIEF_NONE);
gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &w, &h);
@@ -3820,9 +3807,6 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
GtkToggleButton *matching_body, *matching_from;
GtkToggleButton *matching_to, *matching_cc, *matching_subject;
gint ok;
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dia, GTK_WINDOW(window));
@@ -3973,15 +3957,9 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
ok = GTK_RESPONSE_CANCEL;
break;
case GTK_RESPONSE_HELP:
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(window),
"help:balsa/win-search",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(GTK_WIDGET(window));
- gtk_show_uri(screen, "help:balsa/win-search",
- gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error displaying help: %s\n"),
diff --git a/src/pref-manager.c b/src/pref-manager.c
index bd134be16..493ea59bf 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -1089,11 +1089,7 @@ balsa_help_pbox_display(void)
gchar *text, *p;
GError *err = NULL;
gchar *uri;
-#if GTK_CHECK_VERSION(3, 22, 0)
GtkWidget *toplevel;
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
GString *string;
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(pui->view));
@@ -1117,16 +1113,11 @@ balsa_help_pbox_display(void)
g_free(text);
uri = g_string_free(string, FALSE);
-#if GTK_CHECK_VERSION(3, 22, 0)
toplevel = gtk_widget_get_toplevel(GTK_WIDGET(pui->view));
if (gtk_widget_is_toplevel(toplevel)) {
gtk_show_uri_on_window(GTK_WINDOW(toplevel), uri,
gtk_get_current_event_time(), &err);
}
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(pui->view);
- gtk_show_uri(screen, uri, gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error displaying %s: %s\n"),
@@ -1652,11 +1643,7 @@ address_book_set_default_cb(GtkTreeView * tree_view)
static void
add_menu_cb(GtkWidget * menu, GtkWidget * widget)
{
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popup(GTK_POPOVER(menu));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_show_all(menu);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
static void
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 5f81786e6..1bfb00002 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1371,11 +1371,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;
}
@@ -1386,11 +1382,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);
}
@@ -1414,11 +1406,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) */
}
@@ -1429,27 +1417,18 @@ on_open_url_cb(GSimpleAction *action,
gpointer user_data)
{
BalsaAttachInfo *info = user_data;
-#if GTK_CHECK_VERSION(3, 22, 0)
GtkWidget *toplevel;
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
GError *err = NULL;
const gchar * uri;
uri = libbalsa_vfs_get_uri(info->file_uri);
g_message("open URL %s", uri);
-#if GTK_CHECK_VERSION(3, 22, 0)
toplevel = gtk_widget_get_toplevel(info->bm->window);
if (gtk_widget_is_toplevel(toplevel)) {
gtk_show_uri_on_window(GTK_WINDOW(toplevel), uri,
gtk_get_current_event_time(), &err);
}
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(info->bm->window);
- gtk_show_uri(screen, uri, gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error showing %s: %s\n"),
@@ -2464,11 +2443,7 @@ attachment_button_press_cb(GtkWidget * widget, GdkEventButton * event,
gtk_tree_model_get(model, &iter, ATTACH_INFO_COLUMN, &attach_info, -1);
if (attach_info != NULL) {
if (attach_info->popup_menu != NULL) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popup(GTK_POPOVER(attach_info->popup_menu));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_show_all(attach_info->popup_menu);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
g_object_unref(attach_info);
}
@@ -2494,11 +2469,7 @@ attachment_popup_cb(GtkWidget *widget, gpointer user_data)
gtk_tree_model_get(model, &iter, ATTACH_INFO_COLUMN, &attach_info, -1);
if (attach_info != NULL) {
if (attach_info->popup_menu != NULL) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_popover_popup(GTK_POPOVER(attach_info->popup_menu));
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_widget_show_all(attach_info->popup_menu);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
g_object_unref(attach_info);
}
@@ -2866,15 +2837,15 @@ create_text_area(BalsaSendmsg * bsmsg)
bsmsg->text = gtk_text_view_new();
#endif /* HAVE_GTKSOURCEVIEW */
text_view = GTK_TEXT_VIEW(bsmsg->text);
-#if GTK_CHECK_VERSION(3, 23, 1)
+#if GTK_CHECK_VERSION(3, 24, 0)
gtk_text_view_set_left_margin(text_view, 2);
gtk_text_view_set_right_margin(text_view, 2);
-#else /* GTK_CHECK_VERSION(3, 23, 1) */
+#else /* GTK_CHECK_VERSION(3, 24, 0) */
gtk_text_view_set_left_margin(text_view, 0);
gtk_text_view_set_right_margin(text_view, 0);
gtk_widget_set_margin_start(bsmsg->text, 2);
gtk_widget_set_margin_end(bsmsg->text, 2);
-#endif /* GTK_CHECK_VERSION(3, 23, 1) */
+#endif /* GTK_CHECK_VERSION(3, 24, 0) */
/* set the message font */
if (!balsa_app.use_system_fonts) {
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index 8a9f226de..ba06eb37c 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -623,44 +623,6 @@ tm_remove_underscore(const gchar * text)
return r;
}
-#if !GTK_CHECK_VERSION(3, 22, 0)
-/* If the menu is popped up in response to a keystroke, center it
- * immediately below the toolbar.
- */
-static void
-tm_popup_position_func(GtkMenu * menu, gint * x, gint * y,
- gboolean * push_in, gpointer user_data)
-{
- GtkWidget *toolbar = GTK_WIDGET(user_data);
- GdkScreen *screen = gtk_widget_get_screen(toolbar);
- GtkRequisition req;
- gint monitor_num;
- GdkRectangle monitor;
- GtkAllocation allocation;
-
- g_return_if_fail(gtk_widget_get_window(toolbar));
-
- gdk_window_get_origin(gtk_widget_get_window(toolbar), x, y);
-
- gtk_widget_get_preferred_size(GTK_WIDGET(menu), NULL, &req);
-
- gtk_widget_get_allocation(toolbar, &allocation);
- *x += (allocation.width - req.width) / 2;
- *y += allocation.height;
-
- monitor_num = gdk_screen_get_monitor_at_point(screen, *x, *y);
- gtk_menu_set_monitor(menu, monitor_num);
- gdk_screen_get_monitor_geometry(screen, monitor_num, &monitor);
-
- *x = CLAMP(*x, monitor.x,
- monitor.x + MAX(0, monitor.width - req.width));
- *y = CLAMP(*y, monitor.y,
- monitor.y + MAX(0, monitor.height - req.height));
-
- *push_in = FALSE;
-}
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
-
static gboolean
tm_popup_context_menu_cb(GtkWidget * toolbar,
gint x,
@@ -669,9 +631,6 @@ tm_popup_context_menu_cb(GtkWidget * toolbar,
toolbar_info * info)
{
GtkWidget *menu;
-#if !GTK_CHECK_VERSION(3, 22, 0)
- int event_time;
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
guint i;
GSList *group = NULL;
GtkToolbarStyle default_style;
@@ -766,7 +725,6 @@ tm_popup_context_menu_cb(GtkWidget * toolbar,
gtk_menu_attach_to_widget(GTK_MENU(menu), toolbar, NULL);
event = gtk_get_current_event();
-#if GTK_CHECK_VERSION(3, 22, 0)
if (event != NULL && event->type == GDK_BUTTON_PRESS) {
gtk_menu_popup_at_pointer(GTK_MENU(menu), event);
} else {
@@ -776,16 +734,6 @@ tm_popup_context_menu_cb(GtkWidget * toolbar,
GDK_GRAVITY_SOUTH,
NULL);
}
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- event_time = gtk_get_current_event_time();
-
- if (button >= 0)
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button,
- event_time);
- else
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, tm_popup_position_func,
- toolbar, button, event_time);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
if (event != NULL)
gdk_event_free(event);
diff --git a/src/toolbar-prefs.c b/src/toolbar-prefs.c
index 154d43405..8bcf46c97 100644
--- a/src/toolbar-prefs.c
+++ b/src/toolbar-prefs.c
@@ -363,9 +363,6 @@ current_selection_changed_cb(GtkTreeSelection * selection, ToolbarPage * page)
static void
tp_dialog_response_cb(GtkDialog * dialog, gint response, gpointer data)
{
-#if !GTK_CHECK_VERSION(3, 22, 0)
- GdkScreen *screen;
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
GError *err = NULL;
switch (response) {
@@ -374,14 +371,8 @@ tp_dialog_response_cb(GtkDialog * dialog, gint response, gpointer data)
gtk_widget_destroy(GTK_WIDGET(dialog));
break;
case GTK_RESPONSE_HELP:
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_show_uri_on_window(GTK_WINDOW(dialog), "help:balsa/toolbar-prefs",
gtk_get_current_event_time(), &err);
-#else /* GTK_CHECK_VERSION(3, 22, 0) */
- screen = gtk_widget_get_screen(GTK_WIDGET(dialog));
- gtk_show_uri(screen, "help:balsa/toolbar-prefs",
- gtk_get_current_event_time(), &err);
-#endif /* GTK_CHECK_VERSION(3, 22, 0) */
if (err) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error displaying toolbar help: %s\n"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
