aboutsummaryrefslogtreecommitdiff
path: root/src/indicator-session.c
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-01-28 11:18:04 -0600
committerTed Gould <ted@gould.cx>2011-01-28 11:18:04 -0600
commit259beb1229b4b4939ec966688ec04a38a0746110 (patch)
tree852484bb9e8a0001c2e960040eb05b926a3c054f /src/indicator-session.c
parentb5fa5079027eeae92595f8e09df78a694c85a033 (diff)
parent5c4584e8278f37d2e921ad599c55cabeff835a35 (diff)
downloadayatana-indicator-session-259beb1229b4b4939ec966688ec04a38a0746110.tar.gz
ayatana-indicator-session-259beb1229b4b4939ec966688ec04a38a0746110.tar.bz2
ayatana-indicator-session-259beb1229b4b4939ec966688ec04a38a0746110.zip
Import upstream version 0.2.12
Diffstat (limited to 'src/indicator-session.c')
-rw-r--r--src/indicator-session.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/indicator-session.c b/src/indicator-session.c
index d2e679c..2104281 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -72,11 +72,11 @@ INDICATOR_SET_TYPE(INDICATOR_SESSION_TYPE)
static GtkLabel * get_label (IndicatorObject * io);
static GtkImage * get_icon (IndicatorObject * io);
static GtkMenu * get_menu (IndicatorObject * io);
-static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
-static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
+static gboolean build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
+static gboolean new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
static void icon_changed (IndicatorSession * session, const gchar * icon_name);
static void service_connection_cb (IndicatorServiceManager * sm, gboolean connected, gpointer user_data);
-static gboolean build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
+static gboolean build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data);
static void receive_signal (GDBusProxy * proxy, gchar * sender_name, gchar * signal_name, GVariant * parameters, gpointer user_data);
static void service_proxy_cb (GObject * object, GAsyncResult * res, gpointer user_data);
@@ -298,7 +298,7 @@ user_property_change (DbusmenuMenuitem * item, const gchar * property, GVariant
/* Builds an item with a hip little logged in icon. */
static gboolean
-new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+new_user_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
{
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
gint padding = 0;
@@ -476,7 +476,7 @@ restart_property_change (DbusmenuMenuitem * item, const gchar * property, GVaria
/* Builds the restart item which is a more traditional GTK image
menu item that puts the graphic into the gutter. */
static gboolean
-build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+build_restart_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
{
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
if (gmi == NULL) {
@@ -519,7 +519,7 @@ switch_style_set (GtkWidget * widget, GtkStyle * prev_style, gpointer user_data)
to not need ellipsing itself, or if, it will get ellipsed by
the standard label processor. */
static gboolean
-build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
+build_menu_switch (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client, gpointer user_data)
{
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
if (gmi == NULL) {