Rename icon: viking_icon.png -> viking.png

Submitted by Stanislav Brabec

diff --git a/ChangeLog b/ChangeLog
index 78cbfce64fd79aeb6b04fcb97fa454c7ae7588f7..fabc318c306ac6c54f4bcb20b9a0a0dfa50f28bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-30
+Stanislav Brabec <sbrabec@users.sourceforge.net>
+       * Rename icon: viking_icon.png -> viking.png
+
 2008-09-22
 Quy Tonthat <qtonthat@gmail.com>:
        * Change "Zoom To" short cut to avoid conflict with "Zoom Tool".

diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index 850a0dd630887c1541319fe7705ca25bc1f61697..76dc8295366f35a6067e14a3169515e629ca1444 100644 (file)
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -81,7 +81,7 @@ WAYPOINT_ICONS = \
   wp_airplane.png
 
 ICONS = \
-  viking_icon.png \
+  viking.png \
   addtr_18.png \
   begintr_18.png \
   addwp_18.png \
@@ -150,4 +150,4 @@ INCLUDES        = @GTK_CFLAGS@
 AM_CFLAGS       = -Wall -g -D_GNU_SOURCE
 
 iconsdir = $(datadir)/icons
-icons_DATA = viking_icon.png
+icons_DATA = viking.png

diff --git a/src/icons/viking.png b/src/icons/viking.png
new file mode 100644 (file)
index 0000000..1130523
Binary files /dev/null and b/src/icons/viking.png differ

diff --git a/src/icons/viking_icon.png b/src/icons/viking_icon.png
deleted file mode 100644 (file)
index 1130523..0000000
Binary files a/src/icons/viking_icon.png and /dev/null differ

diff --git a/src/main.c b/src/main.c
index 0c9e032402ab158b70b51f9a0dccbfd0d2d4f605..d9427c36703f597fef6e5a72c8b447e411f1adab 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -181,7 +181,7 @@ int main( int argc, char *argv[] )
 #endif
 
   /* Set the icon */
-  main_icon = gdk_pixbuf_from_pixdata(&viking_icon_pixbuf, FALSE, NULL);
+  main_icon = gdk_pixbuf_from_pixdata(&viking_pixbuf, FALSE, NULL);
   gtk_window_set_default_icon(main_icon);
 
   /* Create the first window */

diff --git a/src/viking.desktop.in b/src/viking.desktop.in
index f615fd91f80fc8ea019bc138960f0bd5adeff2b7..945de94e5fc3d1092944e591c723930ef098b9b0 100644 (file)
--- a/src/viking.desktop.in
+++ b/src/viking.desktop.in
@@ -3,7 +3,7 @@ Version=1.0
 _Name=Viking
 _Comment=Map Based GPS Data Manager (live data capable).
 Exec=viking %F
-Icon=viking_icon
+Icon=viking
 Terminal=false
 Type=Application
 StartupNotify=true