Merge branch 'master' of github.com:klesh/fu

.gitignore

@@ -371,3 +371,4 @@ config.status
 INSTALL
 COPYING
 /fu-*
+/fu/src/fu

Makefile.am

@@ -1,20 +1,2 @@
+export ICONS_PREFIX=$(datarootdir)/icons/hicolor/48x48/apps
 SUBDIRS = fu
-
-EXTRA_DIST = \
-	$(desktop_DATA) \
-	$(autostart_DATA) \
-	$(pixmaps_DATA) 
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-
-
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache) $(datadir)/icons/hicolor; \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run these:"; \
-		echo "***   $(gtk_update_icon_cache) $(datadir)/icons/hicolor"; \
-	fi

configure.ac

@@ -8,7 +8,6 @@ AC_CONFIG_SRCDIR([fu/src/main.cpp])
 AM_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE
 
-
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC()

fu/resources/Makefile.am

@@ -6,7 +6,9 @@ autostartdir = $(sysconfdir)/xdg/autostart
 #autostart_DATA = $(autostart_in_file:.desktop.in=.desktop)
 autostart_DATA = fu_startup.desktop
 
-pixmapsdir = $(datarootdir)/icons/hicolor/48x48/apps
+#pixmapsdir = $(datarootdir)/icons/hicolor/48x48/apps
+pixmapsdir = $(ICONS_PREFIX)
+
 pixmaps_DATA = fu.png fu_uploading.png
 
 EXTRA_DIST = \
@@ -21,3 +23,16 @@ CLEANFILES = \
 DISTCLEANFILES = \
   $(desktop_DATA) \
   $(autostart_DATA)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache) $(ICONS_PREFIX); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run these:"; \
+		echo "***   $(gtk_update_icon_cache) $(ICONS_PREFIX)"; \
+	fi

fu/src/Makefile.am

@@ -9,5 +9,7 @@ fu_LDADD = core/libcore.a \
 					 protocols/libprotocols.a \
 					 ui/libui.a
 fu_SOURCES = main.cpp
+fu_CPPFLAGS = -DICONS_PREFIX=\"$(ICONS_PREFIX)\"
+
 #at_LDADD = $(LIBOBJS)
 

fu/src/core/config.cpp

@@ -34,7 +34,6 @@ class Config
 
     Config()
     {
-        wxFileName exec =
         _executeDir = wxFileName( wxStandardPaths::Get().GetExecutablePath() ).GetPath();
 
         wxString folder = wxStandardPaths::Get().GetUserDataDir();

fu/src/ui/Makefile.am

@@ -6,3 +6,4 @@ libui_a_SOURCES = browseform.cpp \
 									sitespanel.cpp \
 									sizerhelper.cpp \
 									tray.cpp
+libui_a_CPPFLAGS = -DICONS_PREFIX=\"$(ICONS_PREFIX)\"

fu/src/ui/tray.cpp

@@ -1,7 +1,6 @@
 #ifndef UI_TRAY
 #define UI_TRAY
 
-
 #include <wx/wx.h>
 #include <wx/icon.h>
 #include <wx/taskbar.h>
@@ -111,8 +110,9 @@ class Tray : public wxTaskBarIcon
         Bind(wxEVT_UPDATE_UI, &Tray::OnUpdateMenu, this);
 #else
 #ifdef __WXGTK__
-        _iconPath = "icon.png";
-        _iconUploadingPath = "icon_uploading.png";
+        _iconPath = wxString(ICONS_PREFIX) + "/fu.png";
+        _iconUploadingPath = wxString(ICONS_PREFIX) + "/fu_uploading.png";
+        wxLogDebug(_iconPath);
 #else
         _iconPath = TheConfig.GetIconPath("16x16", "icon.png");
         _iconUploadingPath = TheConfig.GetIconPath("16x16", "icon_uploading.png");