Hi Radek,
Another random small patch here. I've been noticing logs like the
following on every restart, and the patch fixes that.
Nov 20 22:09:04 neo Qtopia: QString::arg: Argument missing: "1 missed",
@/Communications/Calls/MissedCalls
Nov 20 22:09:04 neo Qtopia: QString::arg: Argument missing: "1 new",
@/Communications/Messages/NewMessages
Regards,
Neil
>From 9b28cb19a53592ab1b8b37fe6a3136b7e18f2276 Mon Sep 17 00:00:00 2001
From: Neil Jerram <n...@ossau.homelinux.net>
Date: Tue, 20 Nov 2012 22:53:00 +0000
Subject: [PATCH 09/13] Avoid "QString::arg: Argument missing" logs
Specifically these:
Nov 20 22:09:04 neo Qtopia: QString::arg: Argument missing: "1 missed", @/Communications/Calls/MissedCalls
Nov 20 22:09:04 neo Qtopia: QString::arg: Argument missing: "1 new", @/Communications/Messages/NewMessages
These arise because the "faen"-derived themes have special cases for 1
missed call and 1 new message - presumably for translation into
languages where the 1 case is different from N != 1. All those places
have an unnecessary <trarg>, which causes the logs, and which this
commit removes.
---
etc/themes/faenqo/home.xml | 4 ++--
etc/themes/faenqomod/home.xml | 4 ++--
etc/themes/mokofaen/home.xml | 4 ++--
etc/themes/mokofaen/home_classic.xml | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/etc/themes/faenqo/home.xml b/etc/themes/faenqo/home.xml
index 51cc841..a511d48 100644
--- a/etc/themes/faenqo/home.xml
+++ b/etc/themes/faenqo/home.xml
@@ -38,7 +38,7 @@
</rect>
</layout>
<text name="calls" size="6" rect="0,25pt,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" >
- <tr><trtext>1 missed</trtext><trarg>@/Communications/Calls/MissedCalls</trarg></tr>
+ <tr><trtext>1 missed</trtext></tr>
</text>
</rect>
<rect name="calls" rect="0,28pt,0x0" transient="yes" active="expr:@/Communications/Calls/MissedCalls > 1" interactive="yes">
@@ -60,7 +60,7 @@
</layout>
<rect rect="0,25pt,0x18pt">
<text rect="0,0,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" transient="yes" active="expr:@/Communications/Messages/NewMessages == 1">
- <tr><trtext>1 new</trtext><trarg>@/Communications/Messages/NewMessages</trarg></tr>
+ <tr><trtext>1 new</trtext></tr>
</text>
<text rect="0,0,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" transient="yes" active="expr:@/Communications/Messages/NewMessages > 1">
<tr><trtext>%1 new</trtext><trarg>@/Communications/Messages/NewMessages</trarg></tr>
diff --git a/etc/themes/faenqomod/home.xml b/etc/themes/faenqomod/home.xml
index 385de0d..8590b3b 100644
--- a/etc/themes/faenqomod/home.xml
+++ b/etc/themes/faenqomod/home.xml
@@ -73,7 +73,7 @@
</rect>
</layout>
<text name="calls" size="6" rect="0,25pt,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" >
- <tr><trtext>1 missed</trtext><trarg>@/Communications/Calls/MissedCalls</trarg></tr>
+ <tr><trtext>1 missed</trtext></tr>
</text>
</rect>
<rect name="calls" rect="0,28pt,0x0" transient="yes" active="expr:@/Communications/Calls/MissedCalls > 1" interactive="yes">
@@ -95,7 +95,7 @@
</layout>
<rect rect="0,25pt,0x18pt">
<text rect="0,0,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" transient="yes" active="expr:@/Communications/Messages/NewMessages == 1">
- <tr><trtext>1 new</trtext><trarg>@/Communications/Messages/NewMessages</trarg></tr>
+ <tr><trtext>1 new</trtext></tr>
</text>
<text rect="0,0,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" transient="yes" active="expr:@/Communications/Messages/NewMessages > 1">
<tr><trtext>%1 new</trtext><trarg>@/Communications/Messages/NewMessages</trarg></tr>
diff --git a/etc/themes/mokofaen/home.xml b/etc/themes/mokofaen/home.xml
index 279a45d..6fd654f 100755
--- a/etc/themes/mokofaen/home.xml
+++ b/etc/themes/mokofaen/home.xml
@@ -63,7 +63,7 @@
</rect>
</layout>
<text name="calls" size="6" rect="0,25pt,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" >
- <tr><trtext>1 missed</trtext><trarg>@/Communications/Calls/MissedCalls</trarg></tr>
+ <tr><trtext>1 missed</trtext></tr>
</text>
</rect>
<rect name="calls" rect="0,28pt,0x0" transient="yes" active="expr:@/Communications/Calls/MissedCalls > 1" interactive="yes">
@@ -85,7 +85,7 @@
</layout>
<rect rect="0,25pt,0x18pt">
<text rect="0,0,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" transient="yes" active="expr:@/Communications/Messages/NewMessages == 1">
- <tr><trtext>1 new</trtext><trarg>@/Communications/Messages/NewMessages</trarg></tr>
+ <tr><trtext>1 new</trtext></tr>
</text>
<text rect="0,0,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" transient="yes" active="expr:@/Communications/Messages/NewMessages > 1">
<tr><trtext>%1 new</trtext><trarg>@/Communications/Messages/NewMessages</trarg></tr>
diff --git a/etc/themes/mokofaen/home_classic.xml b/etc/themes/mokofaen/home_classic.xml
index 96285a5..439771a 100755
--- a/etc/themes/mokofaen/home_classic.xml
+++ b/etc/themes/mokofaen/home_classic.xml
@@ -76,7 +76,7 @@
</rect>
</layout>
<text name="calls" size="6" rect="0,25pt,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" >
- <tr><trtext>1 missed</trtext><trarg>@/Communications/Calls/MissedCalls</trarg></tr>
+ <tr><trtext>1 missed</trtext></tr>
</text>
</rect>
<rect name="calls" rect="0,28pt,0x0" transient="yes" active="expr:@/Communications/Calls/MissedCalls > 1" interactive="yes">
@@ -98,7 +98,7 @@
</layout>
<rect rect="0,25pt,0x18pt">
<text rect="0,0,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" transient="yes" active="expr:@/Communications/Messages/NewMessages == 1">
- <tr><trtext>1 new</trtext><trarg>@/Communications/Messages/NewMessages</trarg></tr>
+ <tr><trtext>1 new</trtext></tr>
</text>
<text rect="0,0,0x9pt" align="hcenter" bold="yes" color="#ffffff" outline="#000000" transient="yes" active="expr:@/Communications/Messages/NewMessages > 1">
<tr><trtext>%1 new</trtext><trarg>@/Communications/Messages/NewMessages</trarg></tr>
--
1.7.10.4
_______________________________________________
Openmoko community mailing list
community@lists.openmoko.org
http://lists.openmoko.org/mailman/listinfo/community
