diff options
| author |  Alan Fitton <ajf@eth0.org.uk> | 2012-01-15 01:13:42 +0000 |
|---|---|---|
| committer | Alan Fitton <ajf@eth0.org.uk> | 2012-01-15 01:13:42 +0000 |
| commit | 48b4d1af4186442fa282d0fba8440bc0f61dc7a9 (patch) | |
| tree | 87d260ce7a7e7e8eaeb48fe22d70492278368a91 /src | |
| parent | 383b0b5f1dc33791d0650f53bc73e9581cc82ecd (diff) | |
installer fix and disable mime icons for win32. this seems to not work most of the time (for most extensions), compared to on Linux at least, and what's worse is it doesn't seem to set the "uncertain" flag so it ends up being a blank icon. just use gtk_stock_file instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/installer.nsi | 4 | ||||
| -rw-r--r-- | src/trg-cell-renderer-file-icon.c | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 65f6d22..7cf5167 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,7 +112,6 @@ if WIN32 windres $^ -o $@ AM_CFLAGS = -mms-bitfields -mwin32 -mwindows -transmission_remote_gtk_LDFLAGS += -Wl,--subsystem,windows transmission_remote_gtk_SOURCES += win32.rc INCLUDES += -O2 else diff --git a/src/installer.nsi b/src/installer.nsi index 371e591..14da2d9 100644 --- a/src/installer.nsi +++ b/src/installer.nsi @@ -250,11 +250,9 @@ Section $(NAME_SecGlibGtkEtc) SecGlibGtkEtc SetOutPath $INSTDIR\share\locale\fr\LC_MESSAGES - File "..\..\gtk-2.24-win32-bin\share\locale\fr\LC_MESSAGES\libiconv.mo" File "..\..\gtk-2.24-win32-bin\share\locale\fr\LC_MESSAGES\gtk20.mo" File "..\..\gtk-2.24-win32-bin\share\locale\fr\LC_MESSAGES\gtk20-properties.mo" File "..\..\gtk-2.24-win32-bin\share\locale\fr\LC_MESSAGES\glib20.mo" - File "..\..\gtk-2.24-win32-bin\share\locale\fr\LC_MESSAGES\gettext-tools.mo" File "..\..\gtk-2.24-win32-bin\share\locale\fr\LC_MESSAGES\gettext-runtime.mo" File "..\..\gtk-2.24-win32-bin\share\locale\fr\LC_MESSAGES\gdk-pixbuf.mo" File "..\..\gtk-2.24-win32-bin\share\locale\fr\LC_MESSAGES\atk10.mo" @@ -480,11 +478,9 @@ Section "Uninstall" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\atk10.mo" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gdk-pixbuf.mo" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gettext-runtime.mo" - Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gettext-tools.mo" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\glib20.mo" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtk20-properties.mo" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\gtk20.mo" - Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\libiconv.mo" Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\transmission-remote-gtk.mo" Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\atk10.mo" Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\gdk-pixbuf.mo" diff --git a/src/trg-cell-renderer-file-icon.c b/src/trg-cell-renderer-file-icon.c index 4e578c8..d61729c 100644 --- a/src/trg-cell-renderer-file-icon.c +++ b/src/trg-cell-renderer-file-icon.c @@ -20,6 +20,10 @@ #include <stdint.h> #include <gtk/gtk.h> +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "trg-cell-renderer-file-icon.h" #include "util.h" @@ -69,6 +73,7 @@ static void trg_cell_renderer_file_icon_refresh(TrgCellRendererFileIcon * } else if (priv->file_id == -1) { g_object_set(fi, "stock-id", GTK_STOCK_DIRECTORY, NULL); } else if (priv->text) { +#ifndef WIN32 gboolean uncertain; gchar *mimetype = g_content_type_guess(priv->text, NULL, 0, &uncertain); @@ -85,6 +90,9 @@ static void trg_cell_renderer_file_icon_refresh(TrgCellRendererFileIcon * } else { g_object_set(fi, "stock-id", GTK_STOCK_FILE, NULL); } +#else + g_object_set(fi, "stock-id", GTK_STOCK_FILE, NULL); +#endif } } |