From 9965db56849163ee33951f459131727ff60c87aa Mon Sep 17 00:00:00 2001
From: smorlat <smorlat@3f6dc0c8-ddfe-455d-9043-3cd528dc4637>
Date: Tue, 6 Jan 2009 13:22:04 +0000
Subject: [PATCH] translations and themes work on win32

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@221 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
---
 linphone/gtk-glade/gtkrc        |  3 +++
 linphone/gtk-glade/linphone.iss | 10 ++++++++--
 linphone/gtk-glade/main.c       |  6 +++++-
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 linphone/gtk-glade/gtkrc

diff --git a/linphone/gtk-glade/gtkrc b/linphone/gtk-glade/gtkrc
new file mode 100644
index 000000000..12f3baee4
--- /dev/null
+++ b/linphone/gtk-glade/gtkrc
@@ -0,0 +1,3 @@
+#include "c:/Program Files/Linphone/share/themes/Cillop/gtk-2.0/gtkrc"
+include "share/themes/XLiquid_GTK-1.0.3/gtk-2.0/gtkrc"
+#include "share/themes/Aero-ion3.1/gtk-2.0/gtkrc"
diff --git a/linphone/gtk-glade/linphone.iss b/linphone/gtk-glade/linphone.iss
index 8318a5b2b..be6a6cc5a 100755
--- a/linphone/gtk-glade/linphone.iss
+++ b/linphone/gtk-glade/linphone.iss
@@ -50,7 +50,11 @@ Source: "..\share\rings\bigben.wav"; DestDir: "{app}\rings"; Flags: ignoreversio
 Source: "..\share\rings\toy.wav"; DestDir: "{app}\rings"; Flags: ignoreversion
 Source: "..\share\rings\tapping.wav"; DestDir: "{app}\rings"; Flags: ignoreversion
 Source: "..\share\rings\oldphone.wav"; DestDir: "{app}\rings"; Flags: ignoreversion
-
+;;Default my preferred gtk theme on windows:
+Source: "..\gtk-glade\gtkrc"; DestDir: "{app}"; Flags: ignoreversion
+;;Locales for linphone:
+Source: "..\po\fr.gmo"; DestDir: "{app}\share\locale\fr\LC_MESSAGES"; DestName: "linphone.mo"; Flags: ignoreversion
+Source: "..\po\sv.gmo"; DestDir: "{app}\share\locale\sv\LC_MESSAGES"; DestName: "linphone.mo"; Flags: ignoreversion
 
 ;;GTK stuff:
 Source: "..\..\gtk+2.12\bin\*.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -60,7 +64,9 @@ Source: "..\..\iconv-1.9.2.win32\bin\*.dll"; DestDir: "{app}"; Flags: ignorevers
 Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\engines\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\engines"; Flags: ignoreversion
 Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\loaders\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\loaders"; Flags: ignoreversion
 Source: "..\..\gtk+2.12\lib\gtk-2.0\2.10.0\immodules\*"; DestDir: "{app}\lib\gtk-2.0\2.10.0\immodules"; Flags: ignoreversion
-
+Source: "..\..\gtk+2.12\share\locale\fr\LC_MESSAGES\*"; DestDir: "{app}\share\locale\fr\LC_MESSAGES"; Flags: ignoreversion
+Source: "..\..\gtk+2.12\share\locale\sv\LC_MESSAGES\*"; DestDir: "{app}\share\locale\sv\LC_MESSAGES"; Flags: ignoreversion
+Source: "..\..\gtk+2.12\share\themes\XLiquid_GTK-1.0.3\gtk-2.0\*"; DestDir: "{app}\share\themes\XLiquid_GTK-1.0.3\gtk-2.0"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
diff --git a/linphone/gtk-glade/main.c b/linphone/gtk-glade/main.c
index 8510edfc0..b13d17660 100644
--- a/linphone/gtk-glade/main.c
+++ b/linphone/gtk-glade/main.c
@@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #endif
 
 #ifndef PACKAGE_LOCALE_DIR
-#define PACKAGE_LOCALE_DIR "po"
+#define PACKAGE_LOCALE_DIR "share/locale/"
 #endif
 
 #define LINPHONE_ICON "linphone2.png"
@@ -841,6 +841,10 @@ int main(int argc, char *argv[]){
 		g_warning("This instance is going to exit now.");
 		return 0;
 	}
+	
+#ifdef WIN32
+	gtk_rc_add_default_file("./gtkrc");
+#endif
 	gdk_threads_enter();
 	if (!gtk_init_with_args(&argc,&argv,_("A free SIP video-phone"),
 				linphone_options,NULL,NULL)){