removed unnecessary 'winType'

diff --git a/findit.desktop b/findit.desktop
index 82d6427..e627894 100644 (file)
--- a/findit.desktop
+++ b/findit.desktop
@@ -9,4 +9,4 @@ StartupWMClass=MainWindow
 X-Icon-path=/usr/share/icons
 X-Window-Icon=findit
 X-HildonDesk-ShowInToolbar=true
-X-Osso-Type=application/x-executable
\ No newline at end of file
+X-Osso-Type=application/x-executable

diff --git a/findit.py b/findit.py
index f977255..015d113 100755 (executable)
--- a/findit.py
+++ b/findit.py
@@ -27,10 +27,6 @@ except:
     def _(text): return text
 
 
-if hildonFound: winType = gtk.Window
-else: winType = gtk.Window
-
-
 ### Common functions ###########################################################
 
 # Функция которая возвращает строку из числа и единиц для столбца "Размер"("Size")
@@ -136,7 +132,7 @@ class PropertiesDialog(gtk.Dialog):
 
 ### Main window ################################################################
 
-class MainWindow(winType):
+class MainWindow(gtk.Window):
 
     # Окно сообщения заданного типа с заданным текстом
     def mess_window(self, mestype, content):

diff --git a/setup.cfg b/setup.cfg
index 47a3115..c725824 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,3 @@
 [install]
 install_scripts=/usr/bin
-install_data=/usr
\ No newline at end of file
+install_data=/usr

diff --git a/setup.py b/setup.py
index edbd7d2..79782f5 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -8,9 +8,9 @@ setup(name='findit',
     version='0.1',
     scripts=['findit'],
     data_files = [
-                 ('share/icons/hicolor/26x26/apps',  ['./icons/findit_icon_26x26.png']),
-                 ('share/icons/hicolor/64x64/apps',  ['./icons/findit_icon_64x64.png']),
-                 ('share/applications/hildon',       ['findit.desktop']),
+                 ('share/icons/hicolor/26x26/apps/findit.png', ['./icons/findit_icon_26x26.png']),
+                 ('share/icons/hicolor/64x64/apps/findit.png', ['./icons/findit_icon_64x64.png']),
+                 ('share/applications/hildon/',      ['findit.desktop']),
                  ('share/findit/',                   ['findit.py']),
                  ('share/locale/ru/LC_MESSAGES/',    ['./ru/LC_MESSAGES/findit.mo']),
                  ('share/locale/ru_RU/LC_MESSAGES/', ['./ru/LC_MESSAGES/findit.mo'])