aboutsummaryrefslogtreecommitdiff
path: root/src/app-indicator.h
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 /src/app-indicator.h
parent23e9b56c533e25febfa8c83c353492403cb1b4d5 (diff)
parent9291697e3e6d4270a7f6200c0dc3d85743feb6d2 (diff)
downloadayatana-indicator-application-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.tar.gz
ayatana-indicator-application-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.tar.bz2
ayatana-indicator-application-b1daa47acf4d6114e7d4703e0ebe5550b0972e21.zip
Updating to trunk and resolve conflicts
Diffstat (limited to 'src/app-indicator.h')
-rw-r--r--src/app-indicator.h26
1 files changed, 19 insertions, 7 deletions
diff --git a/src/app-indicator.h b/src/app-indicator.h
index 586d2dc..8320a2f 100644
--- a/src/app-indicator.h
+++ b/src/app-indicator.h
@@ -69,6 +69,7 @@ G_BEGIN_DECLS
Gets a pointer to the #AppIndicatorClass for the object @obj.
*/
+
#define APP_INDICATOR_TYPE (app_indicator_get_type ())
#define APP_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APP_INDICATOR_TYPE, AppIndicator))
#define APP_INDICATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), APP_INDICATOR_TYPE, AppIndicatorClass))
@@ -101,11 +102,17 @@ G_BEGIN_DECLS
String identifier for the #AppIndicator::connection-changed signal.
*/
+/**
+ APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH:
+
+ String identifier for the #AppIndicator::new-icon-theme-path signal.
+*/
#define APP_INDICATOR_SIGNAL_NEW_ICON "new-icon"
#define APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON "new-attention-icon"
#define APP_INDICATOR_SIGNAL_NEW_STATUS "new-status"
#define APP_INDICATOR_SIGNAL_NEW_LABEL "new-label"
#define APP_INDICATOR_SIGNAL_CONNECTION_CHANGED "connection-changed"
+#define APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH "new-icon-theme-path"
/**
AppIndicatorCategory:
@@ -153,13 +160,13 @@ typedef struct _AppIndicatorPrivate AppIndicatorPrivate;
@new_icon: Slot for #AppIndicator::new-icon.
@new_attention_icon: Slot for #AppIndicator::new-attention-icon.
@new_status: Slot for #AppIndicator::new-status.
+ @new_icon_theme_path: Slot for #AppIndicator::new-icon-theme-path
@connection_changed: Slot for #AppIndicator::connection-changed.
@fallback: Function that gets called to make a #GtkStatusIcon when
there is no Application Indicator area available.
@unfallback: The function that gets called if an Application
Indicator area appears after the fallback has been created.
@new_label: Slot for #AppIndicator::new-label.
- @app_indicator_reserved_1: Reserved for future use.
The signals and external functions that make up the #AppIndicator
class object.
@@ -169,12 +176,12 @@ struct _AppIndicatorClass {
GObjectClass parent_class;
/* DBus Signals */
- void (* new_icon) (AppIndicator *indicator,
+ void (* new_icon) (AppIndicator *indicator,
gpointer user_data);
- void (* new_attention_icon) (AppIndicator *indicator,
+ void (* new_attention_icon) (AppIndicator *indicator,
gpointer user_data);
- void (* new_status) (AppIndicator *indicator,
- const gchar *status,
+ void (* new_status) (AppIndicator *indicator,
+ const gchar *status,
gpointer user_data);
/* Local Signals */
@@ -192,9 +199,11 @@ struct _AppIndicatorClass {
const gchar *label,
const gchar *guide,
gpointer user_data);
+ void (* new_icon_theme_path) (AppIndicator *indicator,
+ const gchar *icon_theme_path,
+ gpointer user_data);
/* Reserved */
- void (*app_indicator_reserved_1)(void);
};
/**
@@ -226,7 +235,7 @@ AppIndicator *app_indicator_new (const gchar
AppIndicator *app_indicator_new_with_path (const gchar *id,
const gchar *icon_name,
AppIndicatorCategory category,
- const gchar *icon_path);
+ const gchar *icon_theme_path);
/* Set properties */
void app_indicator_set_status (AppIndicator *self,
@@ -240,12 +249,15 @@ void app_indicator_set_icon (AppIndicator
void app_indicator_set_label (AppIndicator *self,
const gchar *label,
const gchar *guide);
+void app_indicator_set_icon_theme_path(AppIndicator *self,
+ const gchar *icon_theme_path);
/* Get properties */
const gchar * app_indicator_get_id (AppIndicator *self);
AppIndicatorCategory app_indicator_get_category (AppIndicator *self);
AppIndicatorStatus app_indicator_get_status (AppIndicator *self);
const gchar * app_indicator_get_icon (AppIndicator *self);
+const gchar * app_indicator_get_icon_theme_path(AppIndicator *self);
const gchar * app_indicator_get_attention_icon (AppIndicator *self);
GtkMenu * app_indicator_get_menu (AppIndicator *self);
const gchar * app_indicator_get_label (AppIndicator *self);