diff options
author | Benjamin Barenblat <bbaren@mit.edu> | 2016-10-23 11:45:23 -0400 |
---|---|---|
committer | Benjamin Barenblat <bbaren@mit.edu> | 2016-10-23 11:45:23 -0400 |
commit | e0d00f10c50104ce1a77d035c9c2fc14545c0b92 (patch) | |
tree | e70bdc4879a8cdaf77dce5ff389d8e73cfddd4c3 /src/trg-remote-prefs-dialog.c | |
parent | 4e526acfb28ca68322009c5a958b9926cf3c8413 (diff) | |
parent | 7c29748eee49c59ad09831924f4bbefc9b7ee5f5 (diff) |
Merge branch 'upstream'
Diffstat (limited to 'src/trg-remote-prefs-dialog.c')
-rw-r--r-- | src/trg-remote-prefs-dialog.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c index f8bd43b..3fcd910 100644 --- a/src/trg-remote-prefs-dialog.c +++ b/src/trg-remote-prefs-dialog.c @@ -17,6 +17,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include <math.h> #include <stdint.h> #include <glib/gi18n.h> @@ -436,7 +440,7 @@ static gboolean on_port_tested(gpointer data) _ ("Port is <span font_weight=\"bold\" fgcolor=\"red\">closed</span>")); } else { - trg_error_dialog(GTK_WINDOW(data), response); + trg_error_dialog(GTK_WINDOW(response->cb_data), response); } } @@ -471,7 +475,7 @@ static gboolean on_blocklist_updated(gpointer data) if (response->status == CURLE_OK) { JsonObject *args = get_arguments(response->obj); gchar *labelText = - g_strdup_printf(_("Blocklist (%ld entries)"), + g_strdup_printf(_("Blocklist (%" G_GINT64_FORMAT " entries)"), json_object_get_int_member(args, SGET_BLOCKLIST_SIZE)); gtk_button_set_label(GTK_BUTTON(priv->blocklist_check), @@ -565,7 +569,7 @@ static GtkWidget *trg_rprefs_connPage(TrgRemotePrefsDialog * win, hig_workarea_add_section_title(t, &row, _("Blocklist")); - stringValue = g_strdup_printf(_("Blocklist (%ld entries)"), + stringValue = g_strdup_printf(_("Blocklist (%" G_GINT64_FORMAT " entries)"), session_get_blocklist_size(s)); tb = priv->blocklist_check = trg_json_widget_check_new(&priv->widgets, s, |