sni-qt

Merge lp:~mitya57/sni-qt/fix-pixmap-types into lp:sni-qt

  1. fix-pixmap-types
  2. Merge into trunk.13.04
Proposed by Dmitry Shachnev
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 99
Merged at revision: 99
Proposed branch: lp:~mitya57/sni-qt/fix-pixmap-types
Merge into: lp:sni-qt
Diff against target: 36 lines (+4/-4)
1 file modified
src/org.kde.StatusNotifierItem.xml (+4/-4)
To merge this branch: bzr merge lp:~mitya57/sni-qt/fix-pixmap-types
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Renato Araujo Oliveira Filho Pending
Review via email: mp+263829@code.launchpad.net

Commit message

Fix pixmap types in org.kde.StatusNotifierItem.xml.

Description of the change

Fix pixmap types in org.kde.StatusNotifierItem.xml.

According to the spec, pixmap type is ARRAY(INT, INT, ARRAY BYTE).
This also matches our DBusImageList struct.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looks good to me, Dmitry also submitted a similar merge proposal for appmenu-qt5 - it's all as per the specs. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/org.kde.StatusNotifierItem.xml'
2--- src/org.kde.StatusNotifierItem.xml 2011-08-03 12:30:58 +0000
3+++ src/org.kde.StatusNotifierItem.xml 2015-07-04 15:47:34 +0000
4@@ -19,13 +19,13 @@
5 <property name="IconName" type="s" access="read"/>
6
7 <!--struct containing width, height and image data-->
8- <property name="IconPixmap" type="(iiay)" access="read">
9+ <property name="IconPixmap" type="a(iiay)" access="read">
10 <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageList"/>
11 </property>
12
13 <property name="OverlayIconName" type="s" access="read"/>
14
15- <property name="OverlayIconPixmap" type="(iiay)" access="read">
16+ <property name="OverlayIconPixmap" type="a(iiay)" access="read">
17 <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageList"/>
18 </property>
19
20@@ -34,7 +34,7 @@
21 <property name="AttentionIconName" type="s" access="read"/>
22
23 <!--same definition as image-->
24- <property name="AttentionIconPixmap" type="(iiay)" access="read">
25+ <property name="AttentionIconPixmap" type="a(iiay)" access="read">
26 <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusImageList"/>
27 </property>
28
29@@ -45,7 +45,7 @@
30 <!-- tooltip data -->
31
32 <!--(iiay) is an image-->
33- <property name="ToolTip" type="(s(iiay)ss)" access="read">
34+ <property name="ToolTip" type="(sa(iiay)ss)" access="read">
35 <annotation name="com.trolltech.QtDBus.QtTypeName" value="DBusToolTip"/>
36 </property>
37

Subscribers

People subscribed via source and target branches