Unity

Merge lp:~ted/unity/set-indicator-env into lp:unity

  1. set-indicator-env
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 1081
Proposed branch: lp:~ted/unity/set-indicator-env
Merge into: lp:unity
Diff against target: 26 lines (+9/-0)
1 file modified
services/panel-service.c (+9/-0)
To merge this branch: bzr merge lp:~ted/unity/set-indicator-env
Reviewer Review Type Date Requested Status
Jay Taoko (community) Approve
Review via email: mp+56369@code.launchpad.net

Description of the change

Set the indicator objects' environment so they know where they are.

To post a comment you must log in.
Revision history for this message
Jay Taoko (jaytaoko) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'services/panel-service.c'
--- services/panel-service.c 2011-03-29 15:25:22 +0000
+++ services/panel-service.c 2011-04-05 14:12:25 +0000
@@ -568,6 +568,13 @@
568 g_free (entry_id);568 g_free (entry_id);
569}569}
570570
571static const gchar * indicator_environment[] = {
572 "unity",
573 "unity-3d",
574 "unity-panel-service",
575 NULL
576};
577
571static void578static void
572load_indicator (PanelService *self, IndicatorObject *object, const gchar *_name)579load_indicator (PanelService *self, IndicatorObject *object, const gchar *_name)
573{580{
@@ -575,6 +582,8 @@
575 gchar *name;582 gchar *name;
576 GList *entries, *entry;583 GList *entries, *entry;
577584
585 indicator_object_set_environment(object, (const GStrv)indicator_environment);
586
578 if (_name != NULL)587 if (_name != NULL)
579 name = g_strdup (_name);588 name = g_strdup (_name);
580 else589 else