[maemo-commits] [maemo-commits] r17605 - in projects/haf/trunk/libhildonmime: . debian docs libhildonmime tests/datadir/applications/test

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Mar 9 12:16:40 EET 2009 
Author: richard
Date: 2009-03-09 12:16:25 +0200 (Mon, 09 Mar 2009)
New Revision: 17605

Modified:
   projects/haf/trunk/libhildonmime/ChangeLog
   projects/haf/trunk/libhildonmime/configure.in
   projects/haf/trunk/libhildonmime/debian/changelog
   projects/haf/trunk/libhildonmime/docs/hildon-uri-open-rev-2.txt
   projects/haf/trunk/libhildonmime/libhildonmime/hildon-mime-icon.c
   projects/haf/trunk/libhildonmime/tests/datadir/applications/test/browser.desktop
   projects/haf/trunk/libhildonmime/tests/datadir/applications/test/hildon-control-panel.desktop
   projects/haf/trunk/libhildonmime/tests/datadir/applications/test/hwr-teacher.desktop
   projects/haf/trunk/libhildonmime/tests/datadir/applications/test/image-viewer.desktop
   projects/haf/trunk/libhildonmime/tests/datadir/applications/test/mp_ui.desktop
   projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-addressbook.desktop
   projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-backup.desktop
   projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-global-search.desktop
Log:
NB#103477

Modified: projects/haf/trunk/libhildonmime/ChangeLog
===================================================================
--- projects/haf/trunk/libhildonmime/ChangeLog	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/ChangeLog	2009-03-09 10:16:25 UTC (rev 17605)
@@ -1,3 +1,12 @@
+2009-03-09  Richard Hult  <richard at imendio.com>
+
+	* configure.in: Bump version.
+
+	* docs/hildon-uri-open-rev-2.txt:
+	* libhildonmime/hildon-mime-icon.c:
+	* tests/datadir/applications/test/*.desktop: Applied patch from
+	Mox Soini to fix icon names, NB#103477.
+
 2009-02-12  Richard Hult  <richard at imendio.com>
 
 	* Release 2.1.2.

Modified: projects/haf/trunk/libhildonmime/configure.in
===================================================================
--- projects/haf/trunk/libhildonmime/configure.in	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/configure.in	2009-03-09 10:16:25 UTC (rev 17605)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
  
-AC_INIT(libhildonmime, 2.1.2)
+AC_INIT(libhildonmime, 2.1.3)
 AC_CONFIG_SRCDIR(libhildonmime/hildon-uri.c)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 

Modified: projects/haf/trunk/libhildonmime/debian/changelog
===================================================================
--- projects/haf/trunk/libhildonmime/debian/changelog	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/debian/changelog	2009-03-09 10:16:25 UTC (rev 17605)
@@ -1,3 +1,9 @@
+libhildonmime (2.1.3-1) stable; urgency=low
+
+  * Fixes: NB#103477, wrong common folder icons
+
+ -- Richard Hult <richard at imendio.com>  Fri, 13 Mar 2009 11:58:00 +0100
+
 libhildonmime (2.1.2-1) stable; urgency=low
 
   * Fixes: NB#100619, Real formats must be removed from default.list

Modified: projects/haf/trunk/libhildonmime/docs/hildon-uri-open-rev-2.txt
===================================================================
--- projects/haf/trunk/libhildonmime/docs/hildon-uri-open-rev-2.txt	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/docs/hildon-uri-open-rev-2.txt	2009-03-09 10:16:25 UTC (rev 17605)
@@ -197,7 +197,7 @@
   Name=voip_ap_feature_name
   Comment=voip_ap_feature_name_thumb
   Exec=/usr/bin/osso-voip-ui
-  Icon=qgn_list_voip
+  Icon=general_application_call
   X-Osso-Service=osso_voip_ui
   X-Osso-Type=application/x-executable
 	
@@ -258,7 +258,7 @@
   Comment=addr_ap_address_book_thumb
   Exec=/usr/bin/osso-addressbook
   X-Osso-Service=osso_addressbook
-  Icon=qgn_list_addressbook
+  Icon=general_contacts
   StartupWMClass=osso-addressbook
   MimeType=text/x-vcard
 	
@@ -326,9 +326,9 @@
   Name=weba_ap_web_browser
   Comment=weba_ap_web_browser_thumb
   Exec=/usr/bin/browser
-  Icon=qgn_list_browser
-  X-Window-Icon=qgn_list_browser
-  X-Window-Icon-Dimmed=qgn_list_browser
+  Icon=general_web
+  X-Window-Icon=general_web
+  X-Window-Icon-Dimmed=general_web
   X-Osso-Service=osso_browser
   X-HildonDesk-ShowInToolbar=true
   X-Osso-Type=application/x-executable
@@ -391,7 +391,7 @@
   Type=Application
   Name=medi_ap_mediaplayer_name
   Exec=/usr/bin/mediaplayer-ui
-  Icon=qgn_list_medi
+  Icon=tasklaunch_media_player
   X-Icon-path=/usr/share/pixmaps/
   X-Window-Icon=tn-bookmarks-link
   X-Window-Icon-Dimmed=tn-bookmarks-link-dimmed

Modified: projects/haf/trunk/libhildonmime/libhildonmime/hildon-mime-icon.c
===================================================================
--- projects/haf/trunk/libhildonmime/libhildonmime/hildon-mime-icon.c	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/libhildonmime/hildon-mime-icon.c	2009-03-09 10:16:25 UTC (rev 17605)
@@ -33,15 +33,15 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
 
-#define ICON_NAME_BLOCK_DEVICE          "qgn_list_gene_unknown_file"
-#define ICON_NAME_BROKEN_SYMBOLIC_LINK  "qgn_list_filesys_nonreadable_file"
-#define ICON_NAME_CHARACTER_DEVICE      "qgn_list_gene_unknown_file"
-#define ICON_NAME_DIRECTORY             "qgn_list_filesys_common_fldr"
+#define ICON_NAME_BLOCK_DEVICE          "filemanager_unknown_file"
+#define ICON_NAME_BROKEN_SYMBOLIC_LINK  "filemanager_nonreadable_file"
+#define ICON_NAME_CHARACTER_DEVICE      "filemanager_unknown_file"
+#define ICON_NAME_DIRECTORY             "general_folder"
 #define ICON_NAME_EXECUTABLE            "gnome-fs-executable"
-#define ICON_NAME_FIFO                  "qgn_list_gene_unknown_file"
-#define ICON_NAME_REGULAR               "qgn_list_gene_unknown_file"
+#define ICON_NAME_FIFO                  "filemanager_unknown_file"
+#define ICON_NAME_REGULAR               "filemanager_unknown_file"
 #define ICON_NAME_SEARCH_RESULTS        "gnome-fs-search"
-#define ICON_NAME_SOCKET                "qgn_list_gene_unknown_file"
+#define ICON_NAME_SOCKET                "filemanager_unknown_file"
 
 #define ICON_NAME_MIME_PREFIX           "gnome-mime-"
 

Modified: projects/haf/trunk/libhildonmime/tests/datadir/applications/test/browser.desktop
===================================================================
--- projects/haf/trunk/libhildonmime/tests/datadir/applications/test/browser.desktop	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/tests/datadir/applications/test/browser.desktop	2009-03-09 10:16:25 UTC (rev 17605)
@@ -5,9 +5,9 @@
 Name=weba_ap_web_browser
 Comment=weba_ap_web_browser_thumb
 Exec=/usr/bin/browser
-Icon=qgn_list_browser
-X-Window-Icon=qgn_list_browser
-X-Window-Icon-Dimmed=qgn_list_browser
+Icon=general_web
+X-Window-Icon=general_web
+X-Window-Icon-Dimmed=general_web
 X-Osso-Service=osso_browser
 X-HildonDesk-ShowInToolbar=true
 X-Osso-Type=application/x-executable

Modified: projects/haf/trunk/libhildonmime/tests/datadir/applications/test/hildon-control-panel.desktop
===================================================================
--- projects/haf/trunk/libhildonmime/tests/datadir/applications/test/hildon-control-panel.desktop	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/tests/datadir/applications/test/hildon-control-panel.desktop	2009-03-09 10:16:25 UTC (rev 17605)
@@ -5,7 +5,7 @@
 Name=copa_ap_cp_name
 Comment=copa_ap_cp_name_thumb
 Exec=/usr/bin/controlpanel
-Icon=qgn_list_cntlpane
+Icon=general_settings
 X-Icon-path=/usr/share/pixmaps/
 X-Window-Icon=tn-bookmarks-link
 X-HildonDesk-ShowInToolbar=true

Modified: projects/haf/trunk/libhildonmime/tests/datadir/applications/test/hwr-teacher.desktop
===================================================================
--- projects/haf/trunk/libhildonmime/tests/datadir/applications/test/hwr-teacher.desktop	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/tests/datadir/applications/test/hwr-teacher.desktop	2009-03-09 10:16:25 UTC (rev 17605)
@@ -5,7 +5,7 @@
 Name=inpu_ap_hwr_training_title
 StartupWMClass=hwr-teacher
 Exec=/usr/bin/hwr-teacher
-Icon=qgn_list_cp_peninput
+Icon=dummy
 X-Window-Icon=tn-bookmarks-link
 X-HildonDesk-ShowInToolbar=false
 X-Hildon-Service=hwr_teacher

Modified: projects/haf/trunk/libhildonmime/tests/datadir/applications/test/image-viewer.desktop
===================================================================
--- projects/haf/trunk/libhildonmime/tests/datadir/applications/test/image-viewer.desktop	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/tests/datadir/applications/test/image-viewer.desktop	2009-03-09 10:16:25 UTC (rev 17605)
@@ -5,9 +5,9 @@
 Name=imag_ap_image_viewer_name
 Comment=imag_ap_image_viewer_name_thumb
 Exec=/usr/bin/image-viewer
-Icon=qgn_list_images
+Icon=tasklaunch_photos
 X-Icon-path=/usr/share/pixmaps/
-X-Window-Icon=qgn_list_images
+X-Window-Icon=tasklaunch_photos
 X-HildonDesk-ShowInToolbar=true
 X-Osso-Service=image_viewer
 X-Osso-Type=application/x-executable

Modified: projects/haf/trunk/libhildonmime/tests/datadir/applications/test/mp_ui.desktop
===================================================================
--- projects/haf/trunk/libhildonmime/tests/datadir/applications/test/mp_ui.desktop	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/tests/datadir/applications/test/mp_ui.desktop	2009-03-09 10:16:25 UTC (rev 17605)
@@ -4,7 +4,7 @@
 Type=Application
 Name=medi_ap_mediaplayer_name
 Exec=/usr/bin/mediaplayer-ui
-Icon=qgn_list_medi
+Icon=tasklaunch_media_player
 X-Icon-path=/usr/share/pixmaps/
 X-Window-Icon=tn-bookmarks-link
 X-Window-Icon-Dimmed=tn-bookmarks-link-dimmed

Modified: projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-addressbook.desktop
===================================================================
--- projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-addressbook.desktop	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-addressbook.desktop	2009-03-09 10:16:25 UTC (rev 17605)
@@ -6,7 +6,7 @@
 Comment=addr_ap_address_book_thumb
 Exec=/usr/bin/osso-addressbook
 X-Osso-Service=osso_addressbook
-Icon=qgn_list_addressbook
+Icon=general_contacts
 StartupWMClass=osso-addressbook
 MimeType=text/x-vcard;text/plain;text/html;image/gif;
 

Modified: projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-backup.desktop
===================================================================
--- projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-backup.desktop	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-backup.desktop	2009-03-09 10:16:25 UTC (rev 17605)
@@ -6,9 +6,9 @@
 Comment=back_ap_feature_name_thumb
 StartupWMClass=osso-backup
 Exec=/usr/bin/osso-backup
-Icon=qgn_list_backup
-X-Window-Icon=qgn_list_backup
-X-Window-Icon-Dimmed=qgn_list_backup
+Icon=tasklaunch_backup
+X-Window-Icon=tasklaunch_backup
+X-Window-Icon-Dimmed=tasklaunch_backup
 X-HildonDesk-ShowInToolbar=true
 X-Osso-Type=application/x-executable
 X-Osso-Service=com.nokia.backup

Modified: projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-global-search.desktop
===================================================================
--- projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-global-search.desktop	2009-03-06 17:31:55 UTC (rev 17604)
+++ projects/haf/trunk/libhildonmime/tests/datadir/applications/test/osso-global-search.desktop	2009-03-09 10:16:25 UTC (rev 17605)
@@ -7,9 +7,9 @@
 Name=srch_ap_search
 Comment=srch_ap_search_thumb
 Exec=/usr/bin/osso-global-search
-Icon=qgn_list_find
-X-Window-Icon=qgn_list_find
-X-Window-Icon-Dimmed=qgn_list_find
+Icon=dummy
+X-Window-Icon=dummy
+X-Window-Icon-Dimmed=dummy
 X-HildonDesk-ShowInToolbar=true
 X-Osso-Type=application/x-executable
 X-Osso-Service=osso_global_search
More information about the maemo-commits mailing list