[balsa/wip/gtk4: 32/351] Remove unused conditionally compiled code
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/wip/gtk4: 32/351] Remove unused conditionally compiled code
- Date: Wed, 23 May 2018 21:19:38 +0000 (UTC)
commit 49a679f16123485274eba94d05c302f8297dfc0d
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue Oct 17 19:04:43 2017 -0400
Remove unused conditionally compiled code
libbalsa/identity.c | 8 --------
libbalsa/libbalsa.c | 2 --
libbalsa/libbalsa.h | 4 ----
libbalsa/mime.c | 5 -----
libbalsa/misc.c | 7 -------
libbalsa/smtp-server.c | 10 ----------
src/ab-main.c | 2 --
src/ab-window.c | 2 --
src/address-book-config.c | 8 --------
src/balsa-index.c | 34 ----------------------------------
src/balsa-message.c | 37 -------------------------------------
src/balsa-mime-widget-image.c | 33 ---------------------------------
src/balsa-mime-widget-message.c | 10 +---------
src/balsa-mime-widget-text.c | 37 +------------------------------------
src/filter-edit-callbacks.c | 19 +------------------
src/filter-run-callbacks.c | 9 ---------
src/filter-run-dialog.c | 3 +--
src/folder-conf.c | 9 ---------
src/main-window.c | 26 --------------------------
src/pref-manager.c | 14 --------------
src/sendmsg-window.c | 19 -------------------
src/toolbar-factory.c | 38 --------------------------------------
src/toolbar-prefs.c | 9 ---------
23 files changed, 4 insertions(+), 341 deletions(-)
---
diff --git a/libbalsa/identity.c b/libbalsa/identity.c
index 4068721..dde657b 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -1713,17 +1713,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/libbalsa.c b/libbalsa/libbalsa.c
index a841b80..9fa485e 100644
--- a/libbalsa/libbalsa.c
+++ b/libbalsa/libbalsa.c
@@ -1014,7 +1014,6 @@ libbalsa_image_error_quark(void)
return quark;
}
-#if GTK_CHECK_VERSION(3, 12, 0)
GtkDialogFlags
libbalsa_dialog_flags(void)
{
@@ -1032,4 +1031,3 @@ libbalsa_dialog_flags(void)
}
return dialog_flags;
}
-#endif
diff --git a/libbalsa/libbalsa.h b/libbalsa/libbalsa.h
index d1b2de9..b53d472 100644
--- a/libbalsa/libbalsa.h
+++ b/libbalsa/libbalsa.h
@@ -194,11 +194,7 @@ enum LibBalsaImageError {
#endif /* HAVE_COMPFACE */
};
-#if GTK_CHECK_VERSION(3, 12, 0)
GtkDialogFlags libbalsa_dialog_flags(void);
-#else
-#define libbalsa_dialog_flags() (GtkDialogFlags) (0)
-#endif
#if HAVE_GTKSOURCEVIEW
GtkWidget *libbalsa_source_view_new(gboolean highlight_phrases);
diff --git a/libbalsa/mime.c b/libbalsa/mime.c
index b4a7fe0..3704939 100644
--- a/libbalsa/mime.c
+++ b/libbalsa/mime.c
@@ -658,13 +658,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 7a040df..956ed0b 100644
--- a/libbalsa/misc.c
+++ b/libbalsa/misc.c
@@ -1132,12 +1132,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;
@@ -1215,5 +1209,4 @@ 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) */
}
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index ddb520b..6520b15 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -308,24 +308,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/src/ab-main.c b/src/ab-main.c
index 13da698..0d864e5 100644
--- a/src/ab-main.c
+++ b/src/ab-main.c
@@ -1043,7 +1043,6 @@ bab_set_intial_address_book(LibBalsaAddressBook * ab,
g_action_change_state(action, g_variant_new_string(ab->name));
}
-#if GTK_CHECK_VERSION(3, 12, 0)
GtkDialogFlags
libbalsa_dialog_flags(void)
{
@@ -1061,7 +1060,6 @@ libbalsa_dialog_flags(void)
}
return dialog_flags;
}
-#endif
int
main(int argc, char *argv[])
diff --git a/src/ab-window.c b/src/ab-window.c
index 7d76fe3..899afe8 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -116,7 +116,6 @@ balsa_ab_window_new(gboolean composing, GtkWindow* parent)
GtkWidget *ret;
BalsaAbWindow *ab;
gint use_headerbar = 1;
-#if GTK_CHECK_VERSION(3, 12, 0)
const gchar *dialog_env;
/* header bar configuration */
@@ -124,7 +123,6 @@ balsa_ab_window_new(gboolean composing, GtkWindow* parent)
if ((dialog_env != NULL) && (atoi(dialog_env) == 0)) {
use_headerbar = 0;
}
-#endif
ret = g_object_new(BALSA_TYPE_AB_WINDOW,
"use-header-bar", use_headerbar,
diff --git a/src/address-book-config.c b/src/address-book-config.c
index 82680a5..67aedb0 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -584,18 +584,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 41b6996..981d2c6 100644
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@ -1873,40 +1873,6 @@ bndx_popup_menu_create(BalsaIndex * index)
/* If the menu is popped up in response to a keystroke, center it
* below the headers of the tree-view.
*/
-#if !GTK_CHECK_VERSION(3, 22, 0)
-static void
-bndx_popup_position_func(GtkMenu * menu, gint * x, gint * y,
- gboolean * push_in, gpointer user_data)
-{
- GtkWidget *bindex = GTK_WIDGET(user_data);
- GdkScreen *screen = gtk_widget_get_screen(bindex);
- GtkRequisition req;
- gint monitor_num;
- GdkRectangle monitor;
- GtkAllocation allocation;
-
- g_return_if_fail(gtk_widget_get_window(bindex));
-
- gdk_window_get_origin(gtk_tree_view_get_bin_window
- (GTK_TREE_VIEW(bindex)), x, y);
-
- gtk_widget_get_preferred_size(GTK_WIDGET(menu), NULL, &req);
-
- gtk_widget_get_allocation(bindex, &allocation);
- *x += (allocation.width - req.width) / 2;
-
- 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 void
bndx_do_popup(BalsaIndex * index, GdkEvent * event)
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 9be7572..ab7316c 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -254,15 +254,10 @@ static void
balsa_headers_attachments_popup(GtkButton * button, BalsaMessage * bm)
{
if (bm->parts_popup) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_menu_popup_at_widget(GTK_MENU(bm->parts_popup),
GTK_WIDGET(bm),
GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER,
NULL);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_menu_popup(GTK_MENU(bm->parts_popup), NULL, NULL, NULL, NULL, 0,
- gtk_get_current_event_time());
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
}
@@ -317,25 +312,6 @@ bm_header_tl_buttons(BalsaMessage * bm)
return (GtkWidget **) g_ptr_array_free(array, FALSE);
}
-
-#if !GTK_CHECK_VERSION(3, 15, 0)
-/* Callback for the "style-updated" signal; set the message background to
- * match the base color of the content in the tree-view. */
-static void
-bm_on_set_style(GtkWidget * widget,
- BalsaMessage * bm)
-{
- GtkStyleContext *context;
- GdkRGBA rgba;
-
- context = gtk_widget_get_style_context(bm->treeview);
- gtk_style_context_get_background_color(context, GTK_STATE_FLAG_NORMAL,
- &rgba);
- gtk_widget_override_background_color(bm->scroll,
- GTK_STATE_FLAG_NORMAL, &rgba);
-}
-#endif
-
static void
on_content_size_alloc(GtkWidget * widget, GtkAllocation * allocation,
gint baseline, GtkAllocation * clip,
@@ -726,10 +702,6 @@ balsa_message_init(BalsaMessage * bm)
G_CALLBACK(balsa_mime_widget_key_press_event), bm);
gtk_widget_set_vexpand(scroll, TRUE);
gtk_box_pack_start(GTK_BOX(vbox), scroll);
-#if !GTK_CHECK_VERSION(3, 15, 0)
- g_signal_connect_after(bm, "style-updated",
- G_CALLBACK(bm_on_set_style), bm);
-#endif
g_signal_connect(bm->scroll, "size-allocate",
G_CALLBACK(on_content_size_alloc), NULL);
@@ -998,7 +970,6 @@ tree_mult_selection_popup(BalsaMessage * bm, GdkEvent * event,
G_CALLBACK (part_context_dump_all_cb),
(gpointer) bm->save_all_list);
gtk_menu_shell_append (GTK_MENU_SHELL (bm->save_all_popup), menu_item);
-#if GTK_CHECK_VERSION(3, 22, 0)
if (event)
gtk_menu_popup_at_pointer(GTK_MENU(bm->save_all_popup),
(GdkEvent *) event);
@@ -1007,14 +978,6 @@ tree_mult_selection_popup(BalsaMessage * bm, GdkEvent * event,
GTK_WIDGET(bm),
GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER,
NULL);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- if (event)
- gtk_menu_popup(GTK_MENU(bm->save_all_popup), NULL, NULL, NULL,
- NULL, event->button, event->time);
- else
- gtk_menu_popup(GTK_MENU(bm->save_all_popup), NULL, NULL, NULL,
- NULL, 0, gtk_get_current_event_time());
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
}
diff --git a/src/balsa-mime-widget-image.c b/src/balsa-mime-widget-image.c
index 0749270..f653171 100644
--- a/src/balsa-mime-widget-image.c
+++ b/src/balsa-mime-widget-image.c
@@ -33,11 +33,6 @@
*/
struct _BalsaMimeWidgetImage {
BalsaMimeWidget parent;
-
-#if !GTK_CHECK_VERSION(3, 15, 0)
- GtkStyleContext *context;
- gulong context_changed_handler_id;
-#endif
};
struct _BalsaMimeWidgetImageClass {
@@ -56,16 +51,6 @@ balsa_mime_widget_image_init(BalsaMimeWidgetImage * mwi)
static void
balsa_mime_widget_image_dispose(GObject * obj)
{
-#if !GTK_CHECK_VERSION(3, 15, 0)
- BalsaMimeWidgetImage *mwi = BALSA_MIME_WIDGET_IMAGE(obj);
-
- if (mwi->context_changed_handler_id) {
- g_signal_handler_disconnect(mwi->context,
- mwi->context_changed_handler_id);
- mwi->context_changed_handler_id = 0;
- }
-#endif
-
(*G_OBJECT_CLASS(balsa_mime_widget_image_parent_class)->
dispose) (obj);
}
@@ -85,19 +70,6 @@ static gboolean balsa_image_button_press_cb(GtkWidget * widget, GdkEventButton *
GtkMenu * menu);
static gboolean img_check_size(GtkImage ** widget_p);
-#if !GTK_CHECK_VERSION(3, 15, 0)
-static void
-bmwi_context_changed_cb(GtkStyleContext * context, BalsaMimeWidget * mw)
-{
- GdkRGBA rgba;
-
- gtk_style_context_get_background_color(context,
- GTK_STATE_FLAG_NORMAL, &rgba);
- gtk_widget_override_background_color(mw->widget,
- GTK_STATE_FLAG_NORMAL, &rgba);
-}
-#endif
-
BalsaMimeWidget *
balsa_mime_widget_new_image(BalsaMessage * bm,
LibBalsaMessageBody * mime_body,
@@ -174,12 +146,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 2007359..5e85f9d 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -295,24 +295,16 @@ 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 2fa8d87..fb0fe82 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -472,11 +472,7 @@ text_view_url_popup(GtkTextView *textview, GtkMenu *menu)
gint x, y;
GdkWindow *window;
GdkDisplay *display;
-#if GTK_CHECK_VERSION(3, 19, 0)
GdkSeat *seat;
-#else /* GTK_CHECK_VERSION(3, 20, 0) */
- GdkDeviceManager *manager;
-#endif /* GTK_CHECK_VERSION(3, 20, 0) */
GdkDevice *device;
GtkWidget *menu_item;
@@ -487,13 +483,8 @@ text_view_url_popup(GtkTextView *textview, GtkMenu *menu)
/* check if we are over an url */
window = gtk_text_view_get_window(textview, GTK_TEXT_WINDOW_TEXT);
display = gdk_window_get_display(window);
-#if GTK_CHECK_VERSION(3, 19, 0)
seat = gdk_display_get_default_seat(display);
device = gdk_seat_get_pointer(seat);
-#else /* GTK_CHECK_VERSION(3, 20, 0) */
- manager = gdk_display_get_device_manager(display);
- device = gdk_device_manager_get_client_pointer(manager);
-#endif /* GTK_CHECK_VERSION(3, 20, 0) */
gdk_window_get_device_position(window, device, &x, &y, NULL);
url = find_url(GTK_WIDGET(textview), x, y, url_list);
@@ -690,13 +681,8 @@ prepare_url_offsets(GtkTextBuffer * buffer, GList * url_list)
gtk_text_iter_backward_to_tag_toggle(&iter, url_tag);
#else
while (gtk_text_iter_backward_char(&iter)) {
-#if GTK_CHECK_VERSION(3, 19, 0)
if (gtk_text_iter_starts_tag(&iter, url_tag))
break;
-#else /* GTK_CHECK_VERSION(3, 20, 0) */
- if (gtk_text_iter_begins_tag(&iter, url_tag))
- break;
-#endif /* GTK_CHECK_VERSION(3, 20, 0) */
}
#endif /* BUG_102711_FIXED */
url->start = gtk_text_iter_get_offset(&iter);
@@ -801,9 +787,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 = GTK_STATUSBAR(balsa_app.main_window->statusbar);
@@ -813,13 +796,9 @@ 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) {
balsa_information(LIBBALSA_INFORMATION_WARNING,
_("Error showing %s: %s\n"),
@@ -1122,10 +1101,6 @@ balsa_gtk_html_popup(GtkWidget * html, BalsaMessage * bm)
GtkWidget *menu;
const GdkEvent *event;
GdkEvent *current_event = NULL;
-#if !GTK_CHECK_VERSION(3, 22, 0)
- guint32 time;
- guint button;
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
menu = gtk_menu_new();
bmwt_populate_popup_menu(bm, html, GTK_MENU(menu));
@@ -1138,7 +1113,6 @@ balsa_gtk_html_popup(GtkWidget * html, BalsaMessage * bm)
event = g_object_get_data(G_OBJECT(html), LIBBALSA_HTML_POPUP_EVENT);
if (!event)
event = current_event = gtk_get_current_event();
-#if GTK_CHECK_VERSION(3, 22, 0)
if (event)
gtk_menu_popup_at_pointer(GTK_MENU(menu),
(GdkEvent *) event);
@@ -1149,15 +1123,6 @@ balsa_gtk_html_popup(GtkWidget * html, BalsaMessage * bm)
NULL);
if (current_event)
gdk_event_free(current_event);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- time = gdk_event_get_time(event);
- button = 0;
- gdk_event_get_button(event, &button);
- if (current_event)
- gdk_event_free(current_event);
-
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, time);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
return TRUE;
}
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index 2b93287..80dd1f2 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,
@@ -1469,9 +1460,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 */
@@ -1510,14 +1498,9 @@ 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 e75a6eb..282a183 100644
--- a/src/filter-run-callbacks.c
+++ b/src/filter-run-callbacks.c
@@ -159,9 +159,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);
@@ -177,15 +174,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/filter-run-dialog.c b/src/filter-run-dialog.c
index 7e097a2..6ceb66b 100644
--- a/src/filter-run-dialog.c
+++ b/src/filter-run-dialog.c
@@ -183,9 +183,8 @@ balsa_filter_run_dialog_new(LibBalsaMailbox * mbox, GtkWindow * parent)
g_return_val_if_fail(mbox, NULL);
-#if GTK_CHECK_VERSION(3, 12, 0)
use_headerbar = (libbalsa_dialog_flags() & GTK_DIALOG_USE_HEADER_BAR) != 0;
-#endif
+
p = g_object_new(BALSA_TYPE_FILTER_RUN_DIALOG,
"transient-for", parent,
"use-header-bar", use_headerbar,
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 16e0c99..3c4ccda 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -91,9 +91,6 @@ static void
folder_conf_response(GtkDialog * dialog, int response,
CommonDialogData * cdd)
{
-#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,
@@ -104,14 +101,8 @@ folder_conf_response(GtkDialog * dialog, int response,
g_object_ref(cdd->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 e43ec24..aa1390e 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -931,19 +931,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);
@@ -2762,7 +2753,6 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
GtkWidget *close_pix;
GtkWidget *box;
GtkWidget *but;
- gint w, h;
GtkCssProvider *css_provider;
box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4);
@@ -2792,16 +2782,9 @@ bw_notebook_label_new(BalsaMailboxNode * mbnode)
gtk_box_pack_start(GTK_BOX(box), lab);
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);
- gtk_widget_set_size_request(but, w, h);
-
g_signal_connect(but, "clicked",
G_CALLBACK(bw_mailbox_tab_close_cb), mbnode);
@@ -3924,9 +3907,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));
@@ -4091,15 +4071,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 e13b0c1..81d9287 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -1077,11 +1077,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));
@@ -1105,16 +1101,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"),
@@ -1657,14 +1648,9 @@ static void
add_menu_cb(GtkWidget * menu, GtkWidget * widget)
{
gtk_widget_show(menu);
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_menu_popup_at_widget(GTK_MENU(menu), GTK_WIDGET(widget),
GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_WEST,
NULL);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0,
- gtk_get_current_event_time());
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
static void
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 0ec1795..c176685 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1457,11 +1457,7 @@ attachment_menu_vfs_cb(GtkWidget * menu_item, BalsaAttachInfo * info)
static void
on_open_url_cb(GtkWidget * menu_item, BalsaAttachInfo * info)
{
-#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;
@@ -1470,16 +1466,11 @@ on_open_url_cb(GtkWidget * menu_item, BalsaAttachInfo * info)
g_return_if_fail(uri != NULL);
g_message("open URL %s", uri);
-#if GTK_CHECK_VERSION(3, 22, 0)
toplevel = gtk_widget_get_toplevel(GTK_WIDGET(menu_item));
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(menu_item);
- 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"),
@@ -2474,13 +2465,8 @@ attachment_button_press_cb(GtkWidget * widget, GdkEvent * event,
gtk_tree_model_get(model, &iter, ATTACH_INFO_COLUMN, &attach_info, -1);
if (attach_info) {
if (attach_info->popup_menu) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_menu_popup_at_pointer(GTK_MENU(attach_info->popup_menu),
(GdkEvent *) event);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_menu_popup(GTK_MENU(attach_info->popup_menu), NULL, NULL,
- NULL, NULL, event->button, event->time);
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
g_object_unref(attach_info);
}
@@ -2506,15 +2492,10 @@ attachment_popup_cb(GtkWidget *widget, gpointer user_data)
gtk_tree_model_get(model, &iter, ATTACH_INFO_COLUMN, &attach_info, -1);
if (attach_info) {
if (attach_info->popup_menu) {
-#if GTK_CHECK_VERSION(3, 22, 0)
gtk_menu_popup_at_widget(GTK_MENU(attach_info->popup_menu),
GTK_WIDGET(widget),
GDK_GRAVITY_CENTER, GDK_GRAVITY_CENTER,
NULL);
-#else /*GTK_CHECK_VERSION(3, 22, 0) */
- gtk_menu_popup(GTK_MENU(attach_info->popup_menu), NULL, NULL, NULL,
- NULL, 0, gtk_get_current_event_time());
-#endif /*GTK_CHECK_VERSION(3, 22, 0) */
}
g_object_unref(attach_info);
}
diff --git a/src/toolbar-factory.c b/src/toolbar-factory.c
index e14ca2b..a412db0 100644
--- a/src/toolbar-factory.c
+++ b/src/toolbar-factory.c
@@ -649,44 +649,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,
diff --git a/src/toolbar-prefs.c b/src/toolbar-prefs.c
index 99a2f0a..73e85c1 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]
