[maemo-commits] [maemo-commits] r11597 - in projects/haf/trunk/fontconfig: . debian

[From: subversion at stage.maemo.org]

Author: pavelek
Date: 2007-05-11 17:04:53 +0300 (Fri, 11 May 2007)
New Revision: 11597

Modified:
   projects/haf/trunk/fontconfig/debian/changelog
   projects/haf/trunk/fontconfig/device_symbols.h
Log:
  * New "LOCK" key introduced



Modified: projects/haf/trunk/fontconfig/debian/changelog
===================================================================
--- projects/haf/trunk/fontconfig/debian/changelog	2007-05-11 11:56:29 UTC (rev 11596)
+++ projects/haf/trunk/fontconfig/debian/changelog	2007-05-11 14:04:53 UTC (rev 11597)
@@ -1,3 +1,9 @@
+fontconfig (2.4.1-1osso3) unstable; urgency=low
+
+  * New "LOCK" key introduced
+
+ -- Jakub Pavelek <jakub.pavelek at nokia.com>  Fri, 11 May 2007 17:00:45 +0300
+
 fontconfig (2.4.1-1osso2.1) unstable; urgency=low
 
   * Increasing the version, recompilation is needed to link with libdbus-1-3

Modified: projects/haf/trunk/fontconfig/device_symbols.h
===================================================================
--- projects/haf/trunk/fontconfig/device_symbols.h	2007-05-11 11:56:29 UTC (rev 11596)
+++ projects/haf/trunk/fontconfig/device_symbols.h	2007-05-11 14:04:53 UTC (rev 11597)
@@ -5,7 +5,7 @@
 */
 
 /*
- * Copyright © 2006 Nokia Corporation. All rights reserved.
+ * Copyright © 200, 2007 Nokia Corporation. All rights reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that 
@@ -30,18 +30,21 @@
 #ifndef __DEVICE_SYMBOLS_H__
 #define __DEVICE_SYMBOLS_H__
 
-#define HWK_BUTTON_CANCEL 		"<span font_desc='DeviceSymbols' fallback='false'>&#61450;</span>"
-#define HWK_BUTTON_MENU 		"<span font_desc='DeviceSymbols' fallback='false'>&#61451;</span>"
-#define HWK_BUTTON_HOME		"<span font_desc='DeviceSymbols' fallback='false'>&#61452;</span>"
+#define HWK_BUTTON_ESCAPE 	"<span font_desc='DeviceSymbols' fallback='false'>&#61450;</span>"
+#define HWK_BUTTON_MENU 	"<span font_desc='DeviceSymbols' fallback='false'>&#61451;</span>"
+#define HWK_BUTTON_SWAP		"<span font_desc='DeviceSymbols' fallback='false'>&#61452;</span>"
 #define HWK_BUTTON_VIEW		"<span font_desc='DeviceSymbols' fallback='false'>&#61453;</span>"
-#define HWK_BUTTON_POWER		"<span font_desc='DeviceSymbols' fallback='false'>&#61454;</span>"
-#define HWK_BUTTON_INCREASE		"<span font_desc='DeviceSymbols' fallback='false'>&#61455;</span>"
-#define HWK_BUTTON_DECREASE		"<span font_desc='DeviceSymbols' fallback='false'>&#61456;</span>"
+#define HWK_BUTTON_POWER	"<span font_desc='DeviceSymbols' fallback='false'>&#61454;</span>"
+#define HWK_BUTTON_INCREASE	"<span font_desc='DeviceSymbols' fallback='false'>&#61455;</span>"
+#define HWK_BUTTON_DECREASE	"<span font_desc='DeviceSymbols' fallback='false'>&#61456;</span>"
 #define HWK_BUTTON_UP		"<span font_desc='DeviceSymbols' fallback='false'>&#61457;</span>"
 #define HWK_BUTTON_DOWN		"<span font_desc='DeviceSymbols' fallback='false'>&#61458;</span>"
 #define HWK_BUTTON_LEFT		"<span font_desc='DeviceSymbols' fallback='false'>&#61459;</span>"
-#define HWK_BUTTON_RIGHT		"<span font_desc='DeviceSymbols' fallback='false'>&#61460;</span>"
-#define HWK_BUTTON_SELECT		"<span font_desc='DeviceSymbols' fallback='false'>&#61461;</span>"
+#define HWK_BUTTON_RIGHT	"<span font_desc='DeviceSymbols' fallback='false'>&#61460;</span>"
+#define HWK_BUTTON_SELECT	"<span font_desc='DeviceSymbols' fallback='false'>&#61461;</span>"
+#define HWK_BUTTON_LOCK		"<span font_desc='DeviceSymbols' fallback='false'>&#61462;</span>"
 
-
+/* Deprecated button names */
+#define HWK_BUTTON_HOME 	HWK_BUTTON_SWAP
+#define HWK_BUTTON_CANCEL 	HWK_BUTTON_ESCAPE
 #endif