diff options
| -rw-r--r-- | src/installer.nsi | 11 | ||||
| -rw-r--r-- | src/main.c | 12 | ||||
| -rw-r--r-- | src/trg-main-window.c | 4 |
3 files changed, 25 insertions, 2 deletions
diff --git a/src/installer.nsi b/src/installer.nsi index 7b92a3e..04b7742 100644 --- a/src/installer.nsi +++ b/src/installer.nsi @@ -153,6 +153,8 @@ Section $(NAME_SecGlibGtkEtc) SecGlibGtkEtc File "..\..\gtk-2.24-win32-bin\bin\libpangowin32-1.0-0.dll"
File "..\..\gtk-2.24-win32-bin\bin\libpng14-14.dll"
File "..\..\gtk-2.24-win32-bin\bin\zlib1.dll"
+ File "..\..\gtk-2.24-win32-bin\bin\libintl-8.dll"
+ File "..\..\gtk-2.24-win32-bin\bin\libiconv-2.dll"
File "..\..\gtk-2.24-win32-bin\bin\gspawn-win32-helper-console.exe"
File "..\..\gtk-2.24-win32-bin\bin\gspawn-win32-helper.exe"
@@ -164,6 +166,13 @@ Section $(NAME_SecGlibGtkEtc) SecGlibGtkEtc SetOutPath $INSTDIR\lib\gtk-2.0\modules
File "..\..\gtk-2.24-win32-bin\lib\gtk-2.0\modules\libgail.dll"
+
+ SetOutPath $INSTDIR\share
+
+ File /r "..\..\gtk-2.24-win32-bin\share\icons"
+ File /r "..\..\gtk-2.24-win32-bin\share\locale"
+ File /r "C:\MinGW\msys\1.0\lib\locale"
+
SectionEnd
; Optional section (can be disabled by the user)
@@ -250,6 +259,8 @@ Section "Uninstall" Delete "$INSTDIR\bin\libpangoft2-1.0-0.dll"
Delete "$INSTDIR\bin\libpangowin32-1.0-0.dll"
Delete "$INSTDIR\bin\libpng14-14.dll"
+ Delete "$INSTDIR\bin\libintl-8.dll"
+ Delete "$INSTDIR\bin\libiconv-2.dll"
Delete "$INSTDIR\bin\zlib1.dll"
Delete "$INSTDIR\bin\gspawn-win32-helper-console.exe"
Delete "$INSTDIR\bin\gspawn-win32-helper.exe"
@@ -125,7 +125,9 @@ int main(int argc, char *argv[]) UniqueApp *app = NULL; gboolean withUnique; #endif - +#ifdef WIN32 + gchar *localedir, *moddir; +#endif #ifdef TRG_MEMPROFILE GMemVTable gmvt = {malloc,realloc,free,calloc,malloc,realloc}; g_mem_set_vtable(&gmvt); @@ -138,7 +140,15 @@ int main(int argc, char *argv[]) gtk_init(&argc, &argv); g_set_application_name (PACKAGE_NAME); +#ifdef WIN32 + moddir = g_win32_get_package_installation_directory_of_module(NULL); + localedir = g_build_path(G_DIR_SEPARATOR_S, moddir, "share", "locale", NULL); + g_free(moddir); + bindtextdomain(GETTEXT_PACKAGE, localedir); + g_free(localedir); +#else bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); +#endif bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); textdomain(GETTEXT_PACKAGE); diff --git a/src/trg-main-window.c b/src/trg-main-window.c index 21358f1..c088c8a 100644 --- a/src/trg-main-window.c +++ b/src/trg-main-window.c @@ -1788,6 +1788,8 @@ void trg_main_window_add_status_icon(TrgMainWindow * win) { G_CALLBACK(status_icon_button_press_event), win); g_signal_connect(priv->statusIcon, "popup-menu", G_CALLBACK(trg_status_icon_popup_menu_cb), win); + + gtk_status_icon_set_visible(priv->statusIcon, TRUE); } TrgStateSelector *trg_main_window_get_state_selector(TrgMainWindow * win) { @@ -2056,7 +2058,7 @@ static GObject *trg_main_window_constructor(GType type, ); //g_signal_connect (priv->torrentTreeView, "drag-motion",G_CALLBACK (drag_motion_handl), NULL); g_signal_connect (self, "drag-data-received",G_CALLBACK (on_dropped_file), self); - + return G_OBJECT(self); } |