[balsa] gtk_show_uri is deprecated
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] gtk_show_uri is deprecated
- Date: Wed, 22 Feb 2017 01:04:42 +0000 (UTC)
commit decd9ddde1338af431d10e53bbbd3c6d254f42eb
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue Feb 21 20:03:28 2017 -0500
gtk_show_uri is deprecated
gtk_show_uri is deprecated in favor of gtk_show_uri_on_window
* libbalsa/identity.c (help_ident_cb): fix it.
* libbalsa/smtp-server.c (smtp_server_response): fix it, and
correct the help file URI.
* src/address-book-config.c (create_local_dialog): fix it, and
move the Cancel button to the left;
(help_button_cb): fix it.
* src/balsa-mime-widget-message.c (extbody_call_url): fix it.
* src/balsa-mime-widget-text.c (handle_url): ditto.
* src/filter-edit-callbacks.c (condition_dialog_response),
(fe_dialog_response): ditto.
* src/filter-run-callbacks.c (fr_dialog_response): ditto.
* src/folder-conf.c (folder_conf_response): ditto.
* src/main-window.c (help_activated), (bw_find_real): ditto.
* src/pref-manager.c (balsa_help_pbox_display): ditto.
* src/sendmsg-window.c (on_open_url_cb): ditto.
* src/toolbar-prefs.c (tp_dialog_response_cb): ditto.
ChangeLog | 21 +++++++++++++++++++++
libbalsa/identity.c | 8 +++++++-
libbalsa/smtp-server.c | 10 +++++++++-
src/address-book-config.c | 11 +++++++++--
src/balsa-mime-widget-message.c | 12 ++++++++++++
src/balsa-mime-widget-text.c | 7 +++++++
src/filter-edit-callbacks.c | 15 +++++++++++++++
src/filter-run-callbacks.c | 8 ++++++++
src/folder-conf.c | 7 +++++++
src/main-window.c | 15 +++++++++++++++
src/pref-manager.c | 12 ++++++++++++
src/sendmsg-window.c | 12 ++++++++++++
src/toolbar-prefs.c | 7 +++++++
13 files changed, 141 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 87cba99..7c34776 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
2017-02-21 Peter Bloomfield <pbloomfield bellsouth net>
+ gtk_show_uri is deprecated in favor of gtk_show_uri_on_window
+
+ * libbalsa/identity.c (help_ident_cb): fix it.
+ * libbalsa/smtp-server.c (smtp_server_response): fix it, and
+ correct the help file URI.
+ * src/address-book-config.c (create_local_dialog): fix it, and
+ move the Cancel button to the left;
+ (help_button_cb): fix it.
+ * src/balsa-mime-widget-message.c (extbody_call_url): fix it.
+ * src/balsa-mime-widget-text.c (handle_url): ditto.
+ * src/filter-edit-callbacks.c (condition_dialog_response),
+ (fe_dialog_response): ditto.
+ * src/filter-run-callbacks.c (fr_dialog_response): ditto.
+ * src/folder-conf.c (folder_conf_response): ditto.
+ * src/main-window.c (help_activated), (bw_find_real): ditto.
+ * src/pref-manager.c (balsa_help_pbox_display): ditto.
+ * src/sendmsg-window.c (on_open_url_cb): ditto.
+ * src/toolbar-prefs.c (tp_dialog_response_cb): ditto.
+
+2017-02-21 Peter Bloomfield <pbloomfield bellsouth net>
+
* libbalsa/imap/imap-tls.c: fix OPENSSL_VERSION_NUMBER check
2017-02-20 Peter Bloomfield <pbloomfield bellsouth net>
diff --git a/libbalsa/identity.c b/libbalsa/identity.c
index fa971ea..7fe6913 100644
--- a/libbalsa/identity.c
+++ b/libbalsa/identity.c
@@ -1651,12 +1651,18 @@ delete_ident_response(GtkWidget * confirm, gint response,
static void
help_ident_cb(GtkWidget * widget)
{
- GdkScreen *screen;
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/smtp-server.c b/libbalsa/smtp-server.c
index d1296bd..2c4f867 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -332,16 +332,24 @@ 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:preferences-mail-options#smtp-server-config",
+ "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/address-book-config.c b/src/address-book-config.c
index e45a603..2fdbd25 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -234,9 +234,9 @@ create_local_dialog(AddressBookConfig * abc, const gchar * type)
dialog =
gtk_file_chooser_dialog_new(title, abc->parent,
GTK_FILE_CHOOSER_ACTION_SAVE,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Help"), GTK_RESPONSE_HELP,
action, GTK_RESPONSE_APPLY,
- _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
g_free(title);
#if HAVE_MACOSX_DESKTOP
@@ -582,12 +582,19 @@ create_rubrica_dialog(AddressBookConfig * abc)
static void
help_button_cb(AddressBookConfig * abc)
{
- GdkScreen *screen;
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-mime-widget-message.c b/src/balsa-mime-widget-message.c
index 5eaea9b..d3bf3b9 100644
--- a/src/balsa-mime-widget-message.c
+++ b/src/balsa-mime-widget-message.c
@@ -300,12 +300,24 @@ 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 3574107..a209d75 100644
--- a/src/balsa-mime-widget-text.c
+++ b/src/balsa-mime-widget-text.c
@@ -784,7 +784,9 @@ 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);
@@ -794,8 +796,13 @@ 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"),
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index e5bdc5b..e6162c8 100644
--- a/src/filter-edit-callbacks.c
+++ b/src/filter-edit-callbacks.c
@@ -835,7 +835,9 @@ 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 */
@@ -891,9 +893,15 @@ 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,
@@ -1452,7 +1460,9 @@ 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 */
@@ -1491,9 +1501,14 @@ 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 2c02960..e75a6eb 100644
--- a/src/filter-run-callbacks.c
+++ b/src/filter-run-callbacks.c
@@ -159,7 +159,9 @@ 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);
@@ -175,9 +177,15 @@ 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 aee7dc8..f71cd11 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -91,7 +91,9 @@ 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,
@@ -102,9 +104,14 @@ 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 8467cb1..c0ba925 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -929,12 +929,19 @@ 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);
@@ -3950,7 +3957,9 @@ 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));
@@ -4101,9 +4110,15 @@ 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 3e5731d..c2302a3 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -3478,7 +3478,11 @@ 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));
@@ -3502,8 +3506,16 @@ 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"),
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 87ff391..6006fbd 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -1460,7 +1460,11 @@ 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;
@@ -1469,8 +1473,16 @@ 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"),
diff --git a/src/toolbar-prefs.c b/src/toolbar-prefs.c
index ccd8ed4..8291049 100644
--- a/src/toolbar-prefs.c
+++ b/src/toolbar-prefs.c
@@ -362,7 +362,9 @@ 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) {
@@ -371,9 +373,14 @@ 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]
