From 67d5c1fa6b9ab6e1e7328ee57b15d8e46526d72a Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Sat, 8 Dec 2012 00:30:26 +0100
Subject: Fix the logo's wrong path (Bug#693967)

---
 logo.png    | Bin 31340 -> 0 bytes
 mat-gui     |   2 +-
 mat.desktop |   2 +-
 mat.png     | Bin 0 -> 31340 bytes
 setup.py    |   3 ++-
 5 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 logo.png
 create mode 100644 mat.png

diff --git a/logo.png b/logo.png
deleted file mode 100644
index 4198c42..0000000
Binary files a/logo.png and /dev/null differ
diff --git a/mat-gui b/mat-gui
index 18c7467..7c43957 100755
--- a/mat-gui
+++ b/mat-gui
@@ -52,7 +52,7 @@ class GUI:
         self.window.set_title('Metadata Anonymisation Toolkit')
         self.window.connect('destroy', gtk.main_quit)
         self.window.set_default_size(800, 600)
-        self.logo = mat.get_sharedir('logo.png')
+        self.logo = mat.get_sharedir('mat.png')
         icon = gtk.gdk.pixbuf_new_from_file_at_size(self.logo, 50, 50)
         self.window.set_icon(icon)
 
diff --git a/mat.desktop b/mat.desktop
index 1a5dd16..0d9c3d2 100644
--- a/mat.desktop
+++ b/mat.desktop
@@ -6,4 +6,4 @@ Type=Application
 Exec=mat-gui
 Terminal=false
 Categories=Utility;Security;System;
-Icon=logo
+Icon=mat
diff --git a/mat.png b/mat.png
new file mode 100644
index 0000000..4198c42
Binary files /dev/null and b/mat.png differ
diff --git a/setup.py b/setup.py
index 22a6718..4e0f2a3 100755
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,8 @@ setup(
     scripts           = ['mat', 'mat-gui'],
     data_files        = [
         ( 'share/applications', ['mat.desktop'] ),
-        ( 'share/mat', ['FORMATS', 'logo.png'] ),
+        ( 'share/mat', ['FORMATS'] ),
+        ( 'share/pixmaps', ['mat.png'] ),
         ( 'share/doc/mat', ['README', 'TODO'] ),
     ],
     cmdclass          = {
-- 
cgit v1.3