[meego-commits] 7477: Changes to Trunk:Testing/libsocialweb-qt
James Ausmus
no_reply at build.meego.com
Fri Sep 10 18:28:55 UTC 2010
Hi,
I have made the following changes to libsocialweb-qt in project Trunk:Testing. Please review and accept ASAP.
Thank You,
James Ausmus
[This message was auto-generated]
---
Request #7477:
submit: devel:qt-mtf/libsocialweb-qt(r5) -> Trunk:Testing/libsocialweb-qt
Message:
Fix for BMC#6546 (Description not being read properly for some services)
Fix accidental inclusion of examples/ directory in v0.1.3 (fixes BMC#6546) tarball
State: new 2010-09-10T11:28:54 jausmus
Comment: None
changes files:
--------------
--- libsocialweb-qt.changes
+++ libsocialweb-qt.changes
@@ -0,0 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 10 18:23:27 UTC 2010 - james.ausmus at intel.com
+
+- Fix accidental inclusion of examples/ directory in v0.1.3 (fixes BMC#6546) tarball
+
+-------------------------------------------------------------------
+Thu Sep 9 20:21:47 UTC 2010 - james.ausmus at intel.com
+
+- Fix for BMC#6546 (Description not being read properly for some services)
+
old:
----
libsocialweb-qt-0.1.2.tar.bz2
new:
----
libsocialweb-qt-0.1.3.tar.bz2
spec files:
-----------
--- libsocialweb-qt.spec
+++ libsocialweb-qt.spec
@@ -7,7 +7,7 @@
Name: libsocialweb-qt
Summary: Qt4 API for libsocialweb client DBUS interface
-Version: 0.1.2
+Version: 0.1.3
Release: 1
Group: System/Libraries
License: LGPL 2.1
other changes:
--------------
++++++ libsocialweb-qt-0.1.2.tar.bz2 -> libsocialweb-qt-0.1.3.tar.bz2
--- libsocialweb-qt.pc
+++ libsocialweb-qt.pc
@@ -5,7 +5,7 @@
Name: libsocialweb-qt
Description: Qt Client side library for libsocialweb
-Version: 0.1.2
+Version: 0.1.3
Libs: -L${libdir} -lsocialweb-qt
Cflags: -I${includedir}
Requires: QtDBus glib-2.0 gconf-2.0 libsocialweb-keystore rest-0.7 rest-extras-0.7 gnome-keyring-1
--- libsocialweb-qt.pro.user
+++ libsocialweb-qt.pro.user
+<!DOCTYPE QtCreatorProject>
+<qtcreator>
+ <data>
+ <variable>ProjectExplorer.Project.ActiveTarget</variable>
+ <value type="int">0</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.EditorSettings</variable>
+ <valuemap type="QVariantMap">
+ <value key="EditorConfiguration.Codec" type="QByteArray">System</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Target.0</variable>
+ <valuemap type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Desktop</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
+ <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
+ <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
+ <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
+ <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
+ <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
+ </valuemap>
+ <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+ <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
+ <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
+ <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+ </valuemap>
+ <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
+ <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+ <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
+ <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
+ <value type="QString">clean</value>
+ </valuelist>
+ <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+ </valuemap>
+ <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
+ <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
+ <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/jausmus/shared/devel/repos/m2/libsocialweb-qt</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">3</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
+ </valuemap>
+ <valuemap key="ProjectExplorer.Target.BuildConfiguration.1" type="QVariantMap">
+ <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
+ <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList"/>
+ </valuemap>
+ <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+ <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
+ <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList"/>
+ <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+ </valuemap>
+ <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
+ <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
+ <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
+ <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
+ <value type="QString">clean</value>
+ </valuelist>
+ <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
+ </valuemap>
+ <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
+ <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
+ <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Release</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">0</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString"></value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">3</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
+ <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">false</value>
+ </valuemap>
+ <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">2</value>
+ <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
+ <valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments" type="QVariantList"/>
+ <value key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase" type="int">2</value>
+ <value key="ProjectExplorer.CustomExecutableRunConfiguration.Executable" type="QString"></value>
+ <value key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal" type="bool">false</value>
+ <valuelist key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
+ <value key="ProjectExplorer.CustomExecutableRunConfiguration.UserName" type="QString"></value>
+ <value key="ProjectExplorer.CustomExecutableRunConfiguration.UserSetName" type="bool">false</value>
+ <value key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory" type="QString">$BUILDDIR</value>
+ <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Custom Executable</value>
+ <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">ProjectExplorer.CustomExecutableRunConfiguration</value>
+ </valuemap>
+ <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
+ </valuemap>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.TargetCount</variable>
+ <value type="int">1</value>
+ </data>
+ <data>
+ <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
+ <value type="int">4</value>
+ </data>
+</qtcreator>
--- swclientserviceconfig.cpp
+++ swclientserviceconfig.cpp
@@ -25,6 +25,7 @@
#include <QSettings>
#include <QDesktopServices>
+#include <QLocale>
extern "C" {
@@ -95,6 +96,7 @@
}
mSettings = new QSettings(KEY_FILE_PATH.arg(mSwService->getServiceName()), QSettings::IniFormat);
+ mSettings->setIniCodec("UTF-8");
if (!mSettings) {
qCritical() << QString("SwClientServiceConfig couldn't load QSettings file %1!").arg(
KEY_FILE_PATH.arg(mSwService->getServiceName()));
@@ -502,10 +504,16 @@
} else {
mAuthType = mAuthTypeMap.value(authType);
}
-
- mDisplayName = mSettings->value(SW_KEY_NAME).toString();
mLink = mSettings->value(SW_KEY_LINK).toString();
- mDescription = mSettings->value(SW_KEY_DESCRIPTION).toString();
+ //First we try and grab the Display Name for our particular language_country locale name,
+ //and if it doesn't exist, grab the default as a fallback.
+ mDisplayName = mSettings->value(SW_KEY_NAME.append("[%1]").arg(QLocale::system().name())).toString();
+ if (mDisplayName.isEmpty())
+ mDisplayName = mSettings->value(SW_KEY_NAME).toString();
+
+ mDescription = mSettings->value(SW_KEY_DESCRIPTION.append("[%1]").arg(QLocale::system().name())).toStringList().join(" ");
+ if (mDescription.isEmpty())
+ mDescription = mSettings->value(SW_KEY_DESCRIPTION).toStringList().join(" ");
return true;
}
++++++ libsocialweb-qt.yaml
--- libsocialweb-qt.yaml
+++ libsocialweb-qt.yaml
@@ -1,6 +1,6 @@
Name: libsocialweb-qt
Summary: Qt4 API for libsocialweb client DBUS interface
-Version: 0.1.2
+Version: 0.1.3
Release: 1
Group: System/Libraries
License: LGPL 2.1
More information about the MeeGo-commits
mailing list