aboutsummaryrefslogtreecommitdiff
path: root/src/notification-item.xml
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-08-11 15:55:25 -0500
committerTed Gould <ted@gould.cx>2010-08-11 15:55:25 -0500
commitb7d28a11de1b283cffa4caea1abfb94e01db3fdd (patch)
tree12edca8958f0b5ac704f5724ac75a7263660498f /src/notification-item.xml
parentf34b5e562004795cfb4e09a7daa1d3cbb21f89f0 (diff)
parent7330f014db03391d1859f74b4bcbef13e587aa52 (diff)
downloadlibayatana-appindicator-b7d28a11de1b283cffa4caea1abfb94e01db3fdd.tar.gz
libayatana-appindicator-b7d28a11de1b283cffa4caea1abfb94e01db3fdd.tar.bz2
libayatana-appindicator-b7d28a11de1b283cffa4caea1abfb94e01db3fdd.zip
Merging in the XLabel branch to handle conflicts.
Diffstat (limited to 'src/notification-item.xml')
-rw-r--r--src/notification-item.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/notification-item.xml b/src/notification-item.xml
index b66dfe3..05afd83 100644
--- a/src/notification-item.xml
+++ b/src/notification-item.xml
@@ -12,8 +12,8 @@
to find the icons specified above. -->
<property name="IconThemePath" type="s" access="read" />
<property name="Menu" type="o" access="read" />
- <property name="Label" type="s" access="read" />
- <property name="LabelGuide" type="s" access="read" />
+ <property name="XAyatanaLabel" type="s" access="read" />
+ <property name="XAyatanaLabelGuide" type="s" access="read" />
<property name="XAyatanaOrderingIndex" type="u" access="read" />
<!-- Methods -->
@@ -30,7 +30,7 @@
<signal name="NewStatus">
<arg type="s" name="status" direction="out" />
</signal>
- <signal name="NewLabel">
+ <signal name="XAyatanaNewLabel">
<arg type="s" name="label" direction="out" />
<arg type="s" name="guide" direction="out" />
</signal>