aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-08-05 16:35:25 -0500
committerTed Gould <ted@gould.cx>2010-08-05 16:35:25 -0500
commitb1daa47acf4d6114e7d4703e0ebe5550b0972e21 (patch)
treedc60489a01ba02880f6b01c8786d731b87a9e8a0 /docs
parent23e9b56c533e25febfa8c83c353492403cb1b4d5 (diff)
parent9291697e3e6d4270a7f6200c0dc3d85743feb6d2 (diff)
downloadlibayatana-appindicator-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.tar.gz
libayatana-appindicator-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.tar.bz2
libayatana-appindicator-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.zip
Updating to trunk and resolve conflicts
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/libappindicator-sections.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/reference/libappindicator-sections.txt b/docs/reference/libappindicator-sections.txt
index 49a470d..a342d99 100644
--- a/docs/reference/libappindicator-sections.txt
+++ b/docs/reference/libappindicator-sections.txt
@@ -10,6 +10,7 @@ APP_INDICATOR_SIGNAL_NEW_ICON
APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON
APP_INDICATOR_SIGNAL_NEW_STATUS
APP_INDICATOR_SIGNAL_NEW_LABEL
+APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH
APP_INDICATOR_SIGNAL_CONNECTION_CHANGED
AppIndicatorCategory
AppIndicatorStatus
@@ -24,11 +25,13 @@ app_indicator_set_status
app_indicator_set_attention_icon
app_indicator_set_menu
app_indicator_set_icon
+app_indicator_set_icon_theme_path
app_indicator_set_label
app_indicator_get_id
app_indicator_get_category
app_indicator_get_status
app_indicator_get_icon
+app_indicator_get_icon_theme_path
app_indicator_get_attention_icon
app_indicator_get_menu
app_indicator_get_label