Bundling, working and installation on desktops

Signed-off-by: Daniel Francis <francis@sugarlabs.org>

4 files changed, 3 insertions, 1 deletions

diff --git a/applicationgtk2.py b/applicationgtk2.py
index 64ecc27..a63ebe7 100755
--- a/applicationgtk2.py
+++ b/applicationgtk2.py
@@ -62,6 +62,7 @@ if os.environ['ICONDIR'] != 'SYSTEM':
                                             this_dir)
     icon_theme = gtk.icon_theme_get_for_screen(gtk.gdk.screen_get_default())
     icon_theme.append_search_path(icondir)
+    icon_theme.append_search_path(os.path.join(this_dir, 'icons'))
 
 
 class UnfullscreenButton(gtk.Window):
diff --git a/applicationgtk3.py b/applicationgtk3.py
index d371559..f5ce04b 100755
--- a/applicationgtk3.py
+++ b/applicationgtk3.py
@@ -66,6 +66,7 @@ if os.environ['ICONDIR'] != 'SYSTEM':
                                             this_dir)
     icon_theme = Gtk.IconTheme.get_for_screen(Gdk.Screen.get_default())
     icon_theme.append_search_path(icondir)
+    icon_theme.append_search_path(os.path.join(this_dir, 'icons'))
 
 
 class UnfullscreenButton(Gtk.Window):
diff --git a/install b/install
index c4dc370..7fd5cea 100644..100755
--- a/install
+++ b/install
@@ -23,4 +23,4 @@ import os
 self_path = os.path.abspath(__file__)
 current_list_dir = os.path.split(self_path)[:-1][0]
 os.chdir(current_list_dir)
-os.system('make local')
\ No newline at end of file
+os.system('make install')
diff --git a/makescripts b/makescripts
-Subproject fbe7728c766c8eed8b243f0eadb522f40b0875d
+Subproject 770d1514740f6889ed77eee1b96fa8e234972a8