on win32, set a GTK theme called win32-gtkrc.rc in the directory of the executable. the default GTK theme is *ugly* on windows, the MS-Windows one is less ugly..

4 files changed, 21 insertions, 6 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index d110b0e..4325c07 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/src/main.c b/src/main.c
index 3f79971..eda8d23 100644
--- a/src/main.c
+++ b/src/main.c
@@ -94,12 +94,15 @@ static gboolean should_be_minimised(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
     int returnValue = EXIT_SUCCESS;
+    TrgMainWindow *window;
+    TrgClient *client;
 #ifdef HAVE_LIBUNIQUE
     UniqueApp *app = NULL;
     gboolean withUnique;
 #endif
-    TrgMainWindow *window;
-    TrgClient *client;
+#ifdef WIN32
+    gchar *packagedir, *gtkrcfile;
+#endif
 
 #ifdef DEBUG    
     //GMemVTable gmvt = {malloc,realloc,free,calloc,malloc,realloc};
@@ -110,6 +113,18 @@ int main(int argc, char *argv[])
     
     g_type_init();
     g_thread_init(NULL);
+
+#ifdef WIN32
+    packagedir = g_win32_get_package_installation_directory_of_module(NULL);
+    gtkrcfile = g_build_filename(packagedir, "win32-gtkrc.rc", NULL);
+
+    if (g_file_test(gtkrcfile, G_FILE_TEST_IS_REGULAR))
+    	gtk_rc_add_default_file(gtkrcfile);
+
+	g_free(packagedir);
+	g_free(gtkrcfile);
+#endif
+
     gtk_init(&argc, &argv);
 
     g_set_application_name (PACKAGE_NAME);
diff --git a/src/trg-cell-renderer-numgteqthan.c b/src/trg-cell-renderer-numgteqthan.c
index a2bbd4a..b2bd2f5 100644
--- a/src/trg-cell-renderer-numgteqthan.c
+++ b/src/trg-cell-renderer-numgteqthan.c
@@ -66,7 +66,7 @@ trg_cell_renderer_numgteqthan_set_property(GObject * object, guint property_id,
         priv->value_value = g_value_get_int64(value);
         if (priv->value_value >= priv->minvalue) {
             gchar size_text[32];
-            g_snprintf(size_text, sizeof(size_text), "%ld", priv->value_value);
+            g_snprintf(size_text, sizeof(size_text), "%"G_GINT64_FORMAT, priv->value_value);
             g_object_set(object, "text", size_text, NULL);
         } else {
             g_object_set(object, "text", "", NULL);
diff --git a/src/trg-remote-prefs-dialog.c b/src/trg-remote-prefs-dialog.c
index 7a5beca..00be01a 100644
--- a/src/trg-remote-prefs-dialog.c
+++ b/src/trg-remote-prefs-dialog.c
@@ -238,7 +238,7 @@ static gboolean on_blocklist_updated(gpointer data) {
 
         gtk_widget_set_sensitive(priv->blocklist_update_button, TRUE);
         gtk_button_set_label(GTK_BUTTON(priv->blocklist_update_button),
-                "Update");
+                _("Update"));
 
         if (response->status == CURLE_OK) {
             JsonObject *args = get_arguments(response->obj);