aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile.am4
-rw-r--r--src/app-indicator.c6
-rw-r--r--src/generate-id.c2
-rw-r--r--src/generate-id.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 5b6adc2..a5ea29b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,11 +101,11 @@ DBUS_SPECS = \
gen-%.xml.h: %.xml
@echo "Building $@ from $<"
- @echo "extern const char * $(subst -,_,$(subst .,_,$(basename $<)));" > $@
+ @echo "extern const char * _$(subst -,_,$(subst .,_,$(basename $<)));" > $@
gen-%.xml.c: %.xml
@echo "Building $@ from $<"
- @echo "const char * $(subst -,_,$(subst .,_,$(basename $<))) = " > $@
+ @echo "const char * _$(subst -,_,$(subst .,_,$(basename $<))) = " > $@
@sed -e "s:\":\\\\\":g" -e s:^:\": -e s:\$$:\\\\n\": $< >> $@
@echo ";" >> $@
diff --git a/src/app-indicator.c b/src/app-indicator.c
index 2b45b85..404d69d 100644
--- a/src/app-indicator.c
+++ b/src/app-indicator.c
@@ -477,7 +477,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
if (item_node_info == NULL) {
GError * error = NULL;
- item_node_info = g_dbus_node_info_new_for_xml(notification_item, &error);
+ item_node_info = g_dbus_node_info_new_for_xml(_notification_item, &error);
if (error != NULL) {
g_error("Unable to parse Notification Item DBus interface: %s", error->message);
g_error_free(error);
@@ -495,7 +495,7 @@ app_indicator_class_init (AppIndicatorClass *klass)
if (watcher_node_info == NULL) {
GError * error = NULL;
- watcher_node_info = g_dbus_node_info_new_for_xml(notification_watcher, &error);
+ watcher_node_info = g_dbus_node_info_new_for_xml(_notification_watcher, &error);
if (error != NULL) {
g_error("Unable to parse Notification Item DBus interface: %s", error->message);
g_error_free(error);
@@ -2300,7 +2300,7 @@ app_indicator_get_ordering_index (AppIndicator *self)
g_return_val_if_fail (IS_APP_INDICATOR (self), 0);
if (self->priv->ordering_index == 0) {
- return generate_id(self->priv->category, self->priv->id);
+ return _generate_id(self->priv->category, self->priv->id);
} else {
return self->priv->ordering_index;
}
diff --git a/src/generate-id.c b/src/generate-id.c
index 14d762e..6389678 100644
--- a/src/generate-id.c
+++ b/src/generate-id.c
@@ -24,7 +24,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#define MULTIPLIER 32
guint32
-generate_id (const AppIndicatorCategory catenum, const gchar * id)
+_generate_id (const AppIndicatorCategory catenum, const gchar * id)
{
guchar category = 0;
guchar first = 0;
diff --git a/src/generate-id.h b/src/generate-id.h
index 9d3167d..2c31921 100644
--- a/src/generate-id.h
+++ b/src/generate-id.h
@@ -25,6 +25,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <glib.h>
#include "app-indicator.h"
-guint32 generate_id (const AppIndicatorCategory category, const gchar * id);
+guint32 _generate_id (const AppIndicatorCategory category, const gchar * id);
#endif /* __GENERATE_ID_H__ */