aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-08-10 09:32:43 -0500
committerTed Gould <ted@gould.cx>2010-08-10 09:32:43 -0500
commite2305c3bf9eef48487d116c7e197c589db8a3214 (patch)
treebb632d13e618fa7a1a83082481a9fc75f674ee66
parent2fd1a6b507357716495601e0d28221cf512b85b2 (diff)
parentd7c7a2ae1656af559bfbdb2716fe381d313b5a53 (diff)
downloadayatana-indicator-application-e2305c3bf9eef48487d116c7e197c589db8a3214.tar.gz
ayatana-indicator-application-e2305c3bf9eef48487d116c7e197c589db8a3214.tar.bz2
ayatana-indicator-application-e2305c3bf9eef48487d116c7e197c589db8a3214.zip
* Upstream Merge
* Breaking the ABI in order to get more space in the class structure.
-rw-r--r--debian/changelog8
-rw-r--r--src/Makefile.am2
-rw-r--r--src/app-indicator.h34
3 files changed, 33 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog
index ec98605..720e2db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-application (0.2.3-0ubuntu2~ppa4) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Breaking the ABI in order to get more space in the class
+ structure.
+
+ -- Ted Gould <ted@ubuntu.com> Tue, 10 Aug 2010 09:32:07 -0500
+
indicator-application (0.2.3-0ubuntu2~ppa3) maverick; urgency=low
* Upstream Merge
diff --git a/src/Makefile.am b/src/Makefile.am
index b704b5e..0e84749 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -98,7 +98,7 @@ libappindicator_la_SOURCES = \
application-service-marshal.c
libappindicator_la_LDFLAGS = \
- -version-info 0:0:0 \
+ -version-info 1:0:0 \
-no-undefined \
-export-symbols-regex "^[^_d].*"
diff --git a/src/app-indicator.h b/src/app-indicator.h
index 8320a2f..a9e1c38 100644
--- a/src/app-indicator.h
+++ b/src/app-indicator.h
@@ -161,12 +161,20 @@ typedef struct _AppIndicatorPrivate AppIndicatorPrivate;
@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
+ @new_label: Slot for #AppIndicator::new-label.
@connection_changed: Slot for #AppIndicator::connection-changed.
+ @app_indicator_reserved_sw: Reserved for future use.
+ @app_indicator_reserved_ats: Reserved for future use.
@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.
+ @app_indicator_reserved_2: Reserved for future use.
+ @app_indicator_reserved_3: Reserved for future use.
+ @app_indicator_reserved_4: Reserved for future use.
+ @app_indicator_reserved_5: Reserved for future use.
+ @app_indicator_reserved_6: Reserved for future use.
The signals and external functions that make up the #AppIndicator
class object.
@@ -183,27 +191,33 @@ struct _AppIndicatorClass {
void (* new_status) (AppIndicator *indicator,
const gchar *status,
gpointer user_data);
+ void (* new_icon_theme_path) (AppIndicator *indicator,
+ const gchar *icon_theme_path,
+ gpointer user_data);
+ void (* new_label) (AppIndicator *indicator,
+ const gchar *label,
+ const gchar *guide,
+ gpointer user_data);
/* Local Signals */
void (* connection_changed) (AppIndicator * indicator,
gboolean connected,
gpointer user_data);
+ void (*app_indicator_reserved_sw)(void);
+ void (*app_indicator_reserved_ats)(void);
/* Overridable Functions */
GtkStatusIcon * (*fallback) (AppIndicator * indicator);
void (*unfallback) (AppIndicator * indicator,
GtkStatusIcon * status_icon);
- /* Another DBus Signal */
- void (* new_label) (AppIndicator *indicator,
- 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);
+ void (*app_indicator_reserved_2)(void);
+ void (*app_indicator_reserved_3)(void);
+ void (*app_indicator_reserved_4)(void);
+ void (*app_indicator_reserved_5)(void);
+ void (*app_indicator_reserved_6)(void);
};
/**