gedit r6716 - branches/win32/win32

[icq svn gnome org]

Author: icq
Date: Wed Dec 24 15:01:17 2008
New Revision: 6716
URL: http://svn.gnome.org/viewvc/gedit?rev=6716&view=rev

Log:
Added icons.


Modified:
   branches/win32/win32/build-installer
   branches/win32/win32/gedit.iss.in

Modified: branches/win32/win32/build-installer
==============================================================================
--- branches/win32/win32/build-installer	(original)
+++ branches/win32/win32/build-installer	Wed Dec 24 15:01:17 2008
@@ -205,8 +205,9 @@
 mkdir -p installer/libexec || exit
 cp /libexec/gconfd-2.exe installer/libexec || exit
 
-#mkdir -p installer/share/icons/hicolor/48x48/apps || exit
-#cp /local/share/icons/hicolor/48x48/apps/gedit.png installer/share/icons/hicolor/48x48/apps || exit
+#Icons
+mkdir -p installer/share/icons || exit
+cp -R /share/icons/* installer/share/icons || exit
 
 # This is used for the glom icon in the initial dialog. I'm not sure why GTK
 # does not already get it from the icons/ directory, but it took me already

Modified: branches/win32/win32/gedit.iss.in
==============================================================================
--- branches/win32/win32/gedit.iss.in	(original)
+++ branches/win32/win32/gedit.iss.in	Wed Dec 24 15:01:17 2008
@@ -106,8 +106,7 @@
 Source: "share\gtksourceview-2.0\styles\*"; DestDir: "{app}\share\gtksourceview-2.0\styles"; Components: main
 
 ; Icons
-;Source: "share\icons\hicolor\48x48\apps\gedit.png"; DestDir: "{app}\share\icons\hicolor\48x48\apps"; Components: main
-;Source: "share\pixmaps\gedit.png"; DestDir: "{app}\share\pixmaps"; Components: main
+Source: "share\icons"; DestDir: "{app}\share\icons"; Components: main; Flags: recursesubdirs
 
 ; Other shared gedit files
 Source: "share\gedit-2\ui\*"; DestDir: "{app}\share\gedit-2\ui"; Components: main
@@ -128,12 +127,6 @@
 ;Source: "lib\locale\*"; DestDir: "{app}\lib\locale\"; Flags: recursesubdirs; Components: locale
 Source: "share\locale\*"; DestDir: "{app}\share\locale\"; Flags: recursesubdirs; Components: locale
 
-; Register .gedit file type if we install for all users. Is there a possibility
-; to register a type just for a single user?
-;[Registry]
-;Root: HKCR; Subkey: ".txt"; ValueType: string; ValueData: "geditfile"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; Tasks: common
-;Root: HKCR; Subkey: ".txt"; ValueType: string; ValueName: "Content Type"; ValueData: "application\x-glom"; Flags: deletevalue uninsdeletekeyifempty uninsdeletevalue; Tasks: common
-
 [Dirs]
 ;Name: "{app}\etc\pango";
 ;Name: "{app}\etc\gtk-2.0";