From 79cd86dbfd5b2ea0963c84b48088ec189acfc795 Mon Sep 17 00:00:00 2001 From: Alan Fitton Date: Sun, 18 Sep 2011 16:21:04 +0000 Subject: Big changeset, may break stuff. Unfortunately you can't magically jump into the UI thread using gdk_threads_enter/leave() on Windows, the only way is to schedule a callback using g_idle_add. This required a lot of reworking. Good news, Windows support actually works now \o/ --- src/util.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/util.c') diff --git a/src/util.c b/src/util.c index 85b3ee5..e37e728 100644 --- a/src/util.c +++ b/src/util.c @@ -32,7 +32,6 @@ #include #include "util.h" -#include "dispatch.h" void add_file_id_to_array(JsonObject * args, gchar * key, gint index) { @@ -70,10 +69,9 @@ gchar *trg_gregex_get_first(GRegex * rx, const gchar * src) return dst; } -void trg_error_dialog(GtkWindow * parent, int status, - JsonObject * response) +void trg_error_dialog(GtkWindow * parent, trg_response *response) { - const gchar *msg = make_error_message(response, status); + gchar *msg = make_error_message(response->obj, response->status); GtkWidget *dialog = gtk_message_dialog_new(parent, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, @@ -82,7 +80,7 @@ void trg_error_dialog(GtkWindow * parent, int status, gtk_window_set_title(GTK_WINDOW(dialog), _("Error")); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); - g_free((gpointer) msg); + g_free(msg); } gchar *make_error_message(JsonObject * response, int status) @@ -104,12 +102,6 @@ gchar *make_error_message(JsonObject * response, int status) } } -void response_unref(JsonObject * response) -{ - if (response != NULL) - json_object_unref(response); -} - char *tr_strlpercent(char *buf, double x, size_t buflen) { return tr_strpercent(buf, x, buflen); -- cgit v1.2.3