Merge lp:~3v1n0/indicator-datetime/add-name-hint into lp:indicator-datetime/0.3

Proposed by Marco Trevisan (Treviño)
Status: Merged
Merged at revision: 147
Proposed branch: lp:~3v1n0/indicator-datetime/add-name-hint
Merge into: lp:indicator-datetime/0.3
Diff against target: 29 lines (+8/-0)
1 file modified
src/indicator-datetime.c (+8/-0)
To merge this branch: bzr merge lp:~3v1n0/indicator-datetime/add-name-hint
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+81652@code.launchpad.net

Description of the change

Added the name hint to the indicator, to use it on unity-panel-service.

I'm using the autoconf generated config.h PACKAGE_NAME value.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

This is the only missing branch of this "series"... Please merge it :)

Revision history for this message
Charles Kerr (charlesk) wrote :

Looks fine, this is how the other indicators do it too

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c 2011-09-21 20:19:53 +0000
+++ src/indicator-datetime.c 2011-11-08 23:01:20 +0000
@@ -161,6 +161,7 @@
161static GtkLabel * get_label (IndicatorObject * io);161static GtkLabel * get_label (IndicatorObject * io);
162static GtkMenu * get_menu (IndicatorObject * io);162static GtkMenu * get_menu (IndicatorObject * io);
163static const gchar * get_accessible_desc (IndicatorObject * io);163static const gchar * get_accessible_desc (IndicatorObject * io);
164static const gchar * get_name_hint (IndicatorObject * io);
164static GVariant * bind_enum_set (const GValue * value, const GVariantType * type, gpointer user_data);165static GVariant * bind_enum_set (const GValue * value, const GVariantType * type, gpointer user_data);
165static gboolean bind_enum_get (GValue * value, GVariant * variant, gpointer user_data);166static gboolean bind_enum_get (GValue * value, GVariant * variant, gpointer user_data);
166static gchar * generate_format_string_now (IndicatorDatetime * self);167static gchar * generate_format_string_now (IndicatorDatetime * self);
@@ -200,6 +201,7 @@
200 io_class->get_label = get_label;201 io_class->get_label = get_label;
201 io_class->get_menu = get_menu;202 io_class->get_menu = get_menu;
202 io_class->get_accessible_desc = get_accessible_desc;203 io_class->get_accessible_desc = get_accessible_desc;
204 io_class->get_name_hint = get_name_hint;
203205
204 g_object_class_install_property (object_class,206 g_object_class_install_property (object_class,
205 PROP_SHOW_CLOCK,207 PROP_SHOW_CLOCK,
@@ -1548,3 +1550,9 @@
1548 }1550 }
1549 return NULL;1551 return NULL;
1550}1552}
1553
1554static const gchar *
1555get_name_hint (IndicatorObject * io)
1556{
1557 return PACKAGE_NAME;
1558}

Subscribers

People subscribed via source and target branches