[Xfce4-commits] [thunar-plugins/thunar-vcs-plugin] 07/09: Silence gdk_threads_* deprecations
noreply at xfce.org
noreply at xfce.org
Sat Jun 2 05:09:41 CEST 2018
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository thunar-plugins/thunar-vcs-plugin.
commit 4f7ab1abda18cc2c0edd8ddc036d74ec9b77d621
Author: Andre Miranda <andreldm at xfce.org>
Date: Fri Jun 1 23:43:52 2018 -0300
Silence gdk_threads_* deprecations
---
tvp-svn-helper/main.c | 2 +
tvp-svn-helper/tsh-add.c | 6 ++
tvp-svn-helper/tsh-blame.c | 10 ++++
tvp-svn-helper/tsh-checkout.c | 10 +++-
tvp-svn-helper/tsh-cleanup.c | 18 +++++-
tvp-svn-helper/tsh-commit.c | 14 +++++
tvp-svn-helper/tsh-common.c | 119 +++++++++++++++++++++++++++++++++-------
tvp-svn-helper/tsh-copy.c | 6 ++
tvp-svn-helper/tsh-delete.c | 6 ++
tvp-svn-helper/tsh-diff.c | 13 +++++
tvp-svn-helper/tsh-export.c | 6 ++
tvp-svn-helper/tsh-import.c | 6 ++
tvp-svn-helper/tsh-lock.c | 12 +++-
tvp-svn-helper/tsh-log.c | 14 ++++-
tvp-svn-helper/tsh-move.c | 6 ++
tvp-svn-helper/tsh-properties.c | 20 ++++++-
tvp-svn-helper/tsh-relocate.c | 14 +++++
tvp-svn-helper/tsh-resolved.c | 12 +++-
tvp-svn-helper/tsh-revert.c | 6 ++
tvp-svn-helper/tsh-status.c | 12 ++++
tvp-svn-helper/tsh-switch.c | 6 ++
tvp-svn-helper/tsh-unlock.c | 8 ++-
tvp-svn-helper/tsh-update.c | 6 ++
23 files changed, 300 insertions(+), 32 deletions(-)
diff --git a/tvp-svn-helper/main.c b/tvp-svn-helper/main.c
index 792547e..03664dc 100644
--- a/tvp-svn-helper/main.c
+++ b/tvp-svn-helper/main.c
@@ -245,7 +245,9 @@ int main (int argc, char *argv[])
/* setup translation domain */
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_init ();
+G_GNUC_END_IGNORE_DEPRECATIONS
option_context = g_option_context_new("<action> [options] [args]");
diff --git a/tvp-svn-helper/tsh-add.c b/tvp-svn-helper/tsh-add.c
index 8cdf644..fe1c3c6 100644
--- a/tvp-svn-helper/tsh-add.c
+++ b/tvp-svn-helper/tsh-add.c
@@ -82,9 +82,11 @@ static gpointer add_thread (gpointer user_data)
#endif
{
error_str = tsh_strerror(err);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
g_free(error_str);
svn_error_clear(err);
@@ -106,9 +108,11 @@ static gpointer add_thread (gpointer user_data)
#endif
{
error_str = tsh_strerror(err);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
g_free(error_str);
svn_error_clear(err);
@@ -118,9 +122,11 @@ static gpointer add_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (result);
diff --git a/tvp-svn-helper/tsh-blame.c b/tvp-svn-helper/tsh-blame.c
index d765410..b861ede 100644
--- a/tvp-svn-helper/tsh-blame.c
+++ b/tvp-svn-helper/tsh-blame.c
@@ -75,13 +75,21 @@ static gpointer blame_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_blame_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Blame failed"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -91,9 +99,11 @@ static gpointer blame_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_blame_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-checkout.c b/tvp-svn-helper/tsh-checkout.c
index e220f84..e3791d8 100644
--- a/tvp-svn-helper/tsh-checkout.c
+++ b/tvp-svn-helper/tsh-checkout.c
@@ -69,10 +69,14 @@ static gpointer checkout_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
- tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
+ tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -82,10 +86,12 @@ static gpointer checkout_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
-
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
}
diff --git a/tvp-svn-helper/tsh-cleanup.c b/tvp-svn-helper/tsh-cleanup.c
index 1e05f90..4df7231 100644
--- a/tvp-svn-helper/tsh-cleanup.c
+++ b/tvp-svn-helper/tsh-cleanup.c
@@ -84,12 +84,20 @@ static gpointer cleanup_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
gtk_widget_destroy(dialog);
dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Cleanup failed"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(dialog), TRUE);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -99,11 +107,17 @@ static gpointer cleanup_thread (gpointer user_data)
svn_pool_destroy (subpool);
- gdk_threads_enter();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
gtk_widget_destroy(dialog);
dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Cleanup finished"));
tsh_dialog_start(GTK_DIALOG(dialog), TRUE);
- gdk_threads_leave();
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-commit.c b/tvp-svn-helper/tsh-commit.c
index 22c62ab..6d766a5 100644
--- a/tvp-svn-helper/tsh-commit.c
+++ b/tvp-svn-helper/tsh-commit.c
@@ -107,9 +107,13 @@ static gpointer commit_thread (gpointer user_data)
#endif
{
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -142,9 +146,13 @@ static gpointer commit_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -213,10 +221,14 @@ static gpointer commit_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -239,6 +251,7 @@ static gpointer commit_thread (gpointer user_data)
svn_pool_destroy (subpool);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
#if CHECK_SVN_VERSION_S(1,6)
if (result)
@@ -246,6 +259,7 @@ static gpointer commit_thread (gpointer user_data)
#endif
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (result);
diff --git a/tvp-svn-helper/tsh-common.c b/tvp-svn-helper/tsh-common.c
index aaf8b0b..ce1ea4d 100644
--- a/tvp-svn-helper/tsh-common.c
+++ b/tvp-svn-helper/tsh-common.c
@@ -289,19 +289,23 @@ tsh_auth_simple_plaintext_prompt(svn_boolean_t *may_save_plaintext,
GtkWidget *dialog;
gint result;
- gdk_threads_enter();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
- dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Store password a plaintext?"));
+ dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, _("Store password a plaintext?"));
- result = gtk_dialog_run(GTK_DIALOG(dialog));
+ result = gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy(dialog);
+ gtk_widget_destroy(dialog);
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
- *may_save_plaintext = (result == GTK_RESPONSE_YES);
+ *may_save_plaintext = (result == GTK_RESPONSE_YES);
- return SVN_NO_ERROR;
+ return SVN_NO_ERROR;
}
static svn_error_t*
@@ -319,7 +323,9 @@ tsh_auth_simple_prompt(svn_auth_cred_simple_t **cred,
if(!username)
username = "";
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
dialog = tsh_login_dialog_new(NULL, NULL, 0, username, TRUE, may_save);
@@ -331,7 +337,10 @@ tsh_auth_simple_prompt(svn_auth_cred_simple_t **cred,
tsh_cancel();
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
}
@@ -344,7 +353,10 @@ tsh_auth_simple_prompt(svn_auth_cred_simple_t **cred,
gtk_widget_destroy(dialog);
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return SVN_NO_ERROR;
}
@@ -359,7 +371,9 @@ tsh_auth_username_prompt(svn_auth_cred_username_t **cred,
svn_auth_cred_username_t *ret;
TshLoginDialog *login_dialog;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
dialog = tsh_login_dialog_new(NULL, NULL, 0, "", FALSE, may_save);
@@ -371,7 +385,10 @@ tsh_auth_username_prompt(svn_auth_cred_username_t **cred,
tsh_cancel();
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
}
@@ -383,7 +400,10 @@ tsh_auth_username_prompt(svn_auth_cred_username_t **cred,
gtk_widget_destroy(dialog);
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return SVN_NO_ERROR;
}
@@ -400,7 +420,9 @@ tsh_auth_ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred,
svn_auth_cred_ssl_server_trust_t *ret;
TshTrustDialog *trust_dialog;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
dialog = tsh_trust_dialog_new(NULL, NULL, 0, failures, may_save);
@@ -412,7 +434,10 @@ tsh_auth_ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred,
tsh_cancel();
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
}
@@ -424,7 +449,10 @@ tsh_auth_ssl_server_trust_prompt(svn_auth_cred_ssl_server_trust_t **cred,
gtk_widget_destroy(dialog);
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return SVN_NO_ERROR;
}
@@ -439,7 +467,9 @@ tsh_auth_ssl_client_cert_prompt(svn_auth_cred_ssl_client_cert_t **cred,
svn_auth_cred_ssl_client_cert_t *ret;
TshFileDialog *file_dialog;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
dialog = tsh_file_dialog_new(NULL, NULL, 0, may_save);
@@ -451,7 +481,9 @@ tsh_auth_ssl_client_cert_prompt(svn_auth_cred_ssl_client_cert_t **cred,
tsh_cancel();
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
}
@@ -463,7 +495,10 @@ tsh_auth_ssl_client_cert_prompt(svn_auth_cred_ssl_client_cert_t **cred,
gtk_widget_destroy(dialog);
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return SVN_NO_ERROR;
}
@@ -478,7 +513,9 @@ tsh_auth_ssl_client_cert_pw_prompt(svn_auth_cred_ssl_client_cert_pw_t **cred,
svn_auth_cred_ssl_client_cert_pw_t *ret;
TshLoginDialog *login_dialog;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
dialog = tsh_login_dialog_new(NULL, NULL, 0, NULL, TRUE, may_save);
@@ -490,7 +527,10 @@ tsh_auth_ssl_client_cert_pw_prompt(svn_auth_cred_ssl_client_cert_pw_t **cred,
tsh_cancel();
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
}
@@ -502,7 +542,10 @@ tsh_auth_ssl_client_cert_pw_prompt(svn_auth_cred_ssl_client_cert_pw_t **cred,
gtk_widget_destroy(dialog);
- gdk_threads_leave();
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return SVN_NO_ERROR;
}
@@ -829,9 +872,12 @@ tsh_notify_func2(void *baton, const svn_wc_notify_t *notify, apr_pool_t *pool)
default:
break;
}
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, action, path, mime);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
}
void
@@ -839,10 +885,12 @@ tsh_status_func2(void *baton, const char *path, svn_wc_status2_t *status)
{
TshStatusDialog *dialog = TSH_STATUS_DIALOG (baton);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
if (tsh_status_dialog_get_show_unversioned (dialog) || status->entry)
tsh_status_dialog_add(dialog, path, tsh_status_to_string(status->text_status), tsh_status_to_string(status->prop_status), tsh_status_to_string(status->repos_text_status), tsh_status_to_string(status->repos_prop_status));
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
}
svn_error_t *
@@ -857,10 +905,12 @@ tsh_status_func(void *baton, const char *path, const svn_client_status_t *status
{
TshStatusDialog *dialog = TSH_STATUS_DIALOG (baton);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
if (tsh_status_dialog_get_show_unversioned (dialog) || status->versioned)
tsh_status_dialog_add(dialog, path, tsh_status_to_string(status->text_status), tsh_status_to_string(status->prop_status), tsh_status_to_string(status->repos_text_status), tsh_status_to_string(status->repos_prop_status));
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
return SVN_NO_ERROR;
}
@@ -871,9 +921,11 @@ tsh_log_msg_func2(const char **log_msg, const char **tmp_file, const apr_array_h
int i;
GtkWidget *dialog = baton;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
- gtk_widget_show (dialog);
+ gtk_widget_show (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
if(commit_items)
{
@@ -897,30 +949,45 @@ tsh_log_msg_func2(const char **log_msg, const char **tmp_file, const apr_array_h
state = _("Copied");
else if(item->state_flags & SVN_CLIENT_COMMIT_ITEM_LOCK_TOKEN)
state = _("Unlocked");
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_log_message_dialog_add(TSH_LOG_MESSAGE_DIALOG(dialog), state, item->path);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+
if(gtk_dialog_run(GTK_DIALOG(dialog)) != GTK_RESPONSE_OK)
{
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_cancel();
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
gtk_widget_hide (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
return svn_error_create(SVN_ERR_CANCELLED, NULL, NULL);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+
gdk_threads_enter();
*log_msg = tsh_log_message_dialog_get_message(TSH_LOG_MESSAGE_DIALOG(dialog));
*tmp_file = NULL;
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
- gtk_widget_hide (dialog);
+ gtk_widget_hide (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
return SVN_NO_ERROR;
}
@@ -981,9 +1048,11 @@ tsh_log_func (void *baton, svn_log_entry_t *log_entry, apr_pool_t *pool)
parent = tsh_log_dialog_top (dialog);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
path = tsh_log_dialog_add(dialog, parent, files, log_entry->revision, author, date, message);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
if (log_entry->has_children)
tsh_log_dialog_push (dialog, path);
@@ -1010,9 +1079,11 @@ tsh_blame_func2 (void *baton, apr_int64_t line_no, svn_revnum_t revision, const
apr_ctime((date_str = g_new0(gchar, APR_CTIME_LEN)), date_val);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_blame_dialog_add(dialog, line_no, revision, author, date_str, line);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
g_free(date_str);
@@ -1041,9 +1112,11 @@ tsh_blame_func3 (void *baton, svn_revnum_t start_revision, svn_revnum_t end_revi
apr_ctime((date = g_new0(gchar, APR_CTIME_LEN)), date_val);
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_blame_dialog_add(dialog, line_no, revision, author, date, line);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
g_free(author);
g_free(date);
@@ -1063,9 +1136,13 @@ tsh_proplist_func (void *baton, const char *path, apr_hash_t *prop_hash, apr_poo
gchar *str_value;
apr_hash_this(hi, (const void**)&name, NULL, (void**)&value);
str_value = g_strndup (value->data, value->len);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_properties_dialog_add (dialog, name, str_value);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free (str_value);
}
@@ -1081,9 +1158,11 @@ tsh_commit_func2 (const svn_commit_info_t *commit_info, void *baton, apr_pool_t
if(commit_info->post_commit_err)
{
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Error"), commit_info->post_commit_err, NULL);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
}
else
{
@@ -1097,9 +1176,11 @@ tsh_commit_func2 (const svn_commit_info_t *commit_info, void *baton, apr_pool_t
message = _("Local action");
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Completed"), message, NULL);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
}
return SVN_NO_ERROR;
diff --git a/tvp-svn-helper/tsh-copy.c b/tvp-svn-helper/tsh-copy.c
index 421fdd3..92f43c3 100644
--- a/tvp-svn-helper/tsh-copy.c
+++ b/tvp-svn-helper/tsh-copy.c
@@ -96,10 +96,14 @@ static gpointer copy_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -121,12 +125,14 @@ static gpointer copy_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
#if CHECK_SVN_VERSION_S(1,6)
tsh_notify_dialog_add(dialog, _("Completed"), message, NULL);
#endif
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-delete.c b/tvp-svn-helper/tsh-delete.c
index 557d338..514b796 100644
--- a/tvp-svn-helper/tsh-delete.c
+++ b/tvp-svn-helper/tsh-delete.c
@@ -95,10 +95,14 @@ static gpointer delete_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -120,12 +124,14 @@ static gpointer delete_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
#if CHECK_SVN_VERSION_S(1,6)
tsh_notify_dialog_add(dialog, _("Completed"), message, NULL);
#endif
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-diff.c b/tvp-svn-helper/tsh-diff.c
index f0c79d7..fb344b3 100644
--- a/tvp-svn-helper/tsh-diff.c
+++ b/tvp-svn-helper/tsh-diff.c
@@ -168,9 +168,12 @@ static gpointer diff_thread (gpointer user_data)
break;
svn_stringbuf_appendcstr(buf, APR_EOL_STR);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_diff_dialog_add(dialog, buf->data, buf->len);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
}
svn_pool_destroy(iterpool);
err = svn_stream_close(stream);
@@ -179,9 +182,11 @@ static gpointer diff_thread (gpointer user_data)
}
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_diff_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
@@ -194,12 +199,20 @@ on_error:
gchar *error_str;
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Diff failed"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
tsh_diff_dialog_done (dialog);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
}
diff --git a/tvp-svn-helper/tsh-export.c b/tvp-svn-helper/tsh-export.c
index e616fc0..5b4a909 100644
--- a/tvp-svn-helper/tsh-export.c
+++ b/tvp-svn-helper/tsh-export.c
@@ -74,10 +74,14 @@ static gpointer export_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -87,9 +91,11 @@ static gpointer export_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-import.c b/tvp-svn-helper/tsh-import.c
index ca6f009..2812658 100644
--- a/tvp-svn-helper/tsh-import.c
+++ b/tvp-svn-helper/tsh-import.c
@@ -82,10 +82,14 @@ static gpointer import_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -99,12 +103,14 @@ static gpointer import_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
#if CHECK_SVN_VERSION_S(1,6)
tsh_notify_dialog_add(dialog, _("Completed"), buffer, NULL);
#endif
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-lock.c b/tvp-svn-helper/tsh-lock.c
index b2d70aa..3a749b3 100644
--- a/tvp-svn-helper/tsh-lock.c
+++ b/tvp-svn-helper/tsh-lock.c
@@ -89,10 +89,14 @@ static gpointer lock_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
- gdk_threads_leave();
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -102,10 +106,12 @@ static gpointer lock_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
- gdk_threads_leave();
-
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
}
diff --git a/tvp-svn-helper/tsh-log.c b/tvp-svn-helper/tsh-log.c
index 4ae9e42..abfd985 100644
--- a/tvp-svn-helper/tsh-log.c
+++ b/tvp-svn-helper/tsh-log.c
@@ -66,10 +66,12 @@ static gpointer log_thread (gpointer user_data)
GtkWidget *error;
gchar *error_str;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter ();
strict_history = tsh_log_dialog_get_hide_copied (dialog);
merged_revisions = tsh_log_dialog_get_show_merged (dialog);
gdk_threads_leave ();
+G_GNUC_END_IGNORE_DEPRECATIONS
if(!paths)
{
@@ -116,13 +118,21 @@ static gpointer log_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_log_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Log failed"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -132,9 +142,11 @@ static gpointer log_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_log_dialog_done (dialog);
- gdk_threads_leave();
+ gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-move.c b/tvp-svn-helper/tsh-move.c
index 0326317..369a319 100644
--- a/tvp-svn-helper/tsh-move.c
+++ b/tvp-svn-helper/tsh-move.c
@@ -86,10 +86,14 @@ static gpointer move_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -111,12 +115,14 @@ static gpointer move_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
#if CHECK_SVN_VERSION_S(1,6)
tsh_notify_dialog_add(dialog, _("Completed"), message, NULL);
#endif
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-properties.c b/tvp-svn-helper/tsh-properties.c
index 651ca6a..889df2e 100644
--- a/tvp-svn-helper/tsh-properties.c
+++ b/tvp-svn-helper/tsh-properties.c
@@ -134,19 +134,23 @@ static gpointer properties_thread (gpointer user_data)
subpool)))
#endif
{
- //svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
- //tsh_properties_dialog_done (dialog);
+G_GNUC_END_IGNORE_DEPRECATIONS
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Set property failed"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
- //return GINT_TO_POINTER (FALSE);
}
}
@@ -175,13 +179,21 @@ static gpointer properties_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_properties_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Properties failed"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -191,9 +203,11 @@ static gpointer properties_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_properties_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-relocate.c b/tvp-svn-helper/tsh-relocate.c
index 9a32c7c..0763bab 100644
--- a/tvp-svn-helper/tsh-relocate.c
+++ b/tvp-svn-helper/tsh-relocate.c
@@ -72,12 +72,20 @@ static gpointer relocate_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
gtk_widget_destroy(dialog);
dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Relocate failed"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(dialog), TRUE);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -87,11 +95,17 @@ static gpointer relocate_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
gtk_widget_destroy(dialog);
dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_OTHER, GTK_BUTTONS_CLOSE, _("Relocate finished"));
tsh_dialog_start(GTK_DIALOG(dialog), TRUE);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-resolved.c b/tvp-svn-helper/tsh-resolved.c
index f101c20..02f8c77 100644
--- a/tvp-svn-helper/tsh-resolved.c
+++ b/tvp-svn-helper/tsh-resolved.c
@@ -71,9 +71,13 @@ static gpointer resolved_thread (gpointer user_data)
if ((err = svn_client_resolve(files[i], svn_depth_empty, svn_wc_conflict_choose_merged, ctx, subpool)))
{
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -87,9 +91,13 @@ static gpointer resolved_thread (gpointer user_data)
if ((err = svn_client_resolve("", svn_depth_empty, svn_wc_conflict_choose_merged, ctx, subpool)))
{
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -99,10 +107,12 @@ static gpointer resolved_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
-
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_reset_cancel();
return GINT_TO_POINTER (result);
}
diff --git a/tvp-svn-helper/tsh-revert.c b/tvp-svn-helper/tsh-revert.c
index b9ace59..c86994b 100644
--- a/tvp-svn-helper/tsh-revert.c
+++ b/tvp-svn-helper/tsh-revert.c
@@ -90,10 +90,14 @@ static gpointer revert_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -103,9 +107,11 @@ static gpointer revert_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-status.c b/tvp-svn-helper/tsh-status.c
index 2103abf..3906674 100644
--- a/tvp-svn-helper/tsh-status.c
+++ b/tvp-svn-helper/tsh-status.c
@@ -62,6 +62,7 @@ static gpointer status_thread (gpointer user_data)
GtkWidget *error;
gchar *error_str;
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
depth = tsh_status_dialog_get_depth(dialog);
get_all = tsh_status_dialog_get_show_unmodified(dialog);
@@ -69,6 +70,7 @@ static gpointer status_thread (gpointer user_data)
no_ignore = tsh_status_dialog_get_show_ignore(dialog);
ignore_externals = tsh_status_dialog_get_hide_externals(dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
subpool = svn_pool_create (pool);
@@ -98,13 +100,21 @@ static gpointer status_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_status_dialog_done (dialog);
error = gtk_message_dialog_new(GTK_WINDOW(dialog), GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Status failed"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(error), "%s", error_str);
tsh_dialog_start(GTK_DIALOG(error), FALSE);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -114,9 +124,11 @@ static gpointer status_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_status_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-switch.c b/tvp-svn-helper/tsh-switch.c
index e4ed05c..3fe2db1 100644
--- a/tvp-svn-helper/tsh-switch.c
+++ b/tvp-svn-helper/tsh-switch.c
@@ -73,10 +73,14 @@ static gpointer switch_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -86,9 +90,11 @@ static gpointer switch_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
diff --git a/tvp-svn-helper/tsh-unlock.c b/tvp-svn-helper/tsh-unlock.c
index 03d0ef1..fcc9547 100644
--- a/tvp-svn-helper/tsh-unlock.c
+++ b/tvp-svn-helper/tsh-unlock.c
@@ -84,10 +84,14 @@ static gpointer unlock_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -97,10 +101,12 @@ static gpointer unlock_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
-
+G_GNUC_END_IGNORE_DEPRECATIONS
+
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
}
diff --git a/tvp-svn-helper/tsh-update.c b/tvp-svn-helper/tsh-update.c
index bf71b16..60fd2bd 100644
--- a/tvp-svn-helper/tsh-update.c
+++ b/tvp-svn-helper/tsh-update.c
@@ -90,10 +90,14 @@ static gpointer update_thread (gpointer user_data)
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
+
g_free(error_str);
svn_error_clear(err);
@@ -103,9 +107,11 @@ static gpointer update_thread (gpointer user_data)
svn_pool_destroy (subpool);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
+G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list