Indicator Applet

Merge lp://staging/~ted/indicator-applet/now-with-me into lp://staging/indicator-applet/0.4

  1. now-with-me
  2. Merge into applet
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~ted/indicator-applet/now-with-me
Merge into: lp://staging/indicator-applet/0.4
Diff against target: 26 lines (+4/-1)
2 files modified
src-session/applet-main.c (+1/-1)
src/applet-main.c (+3/-0)
To merge this branch: bzr merge lp://staging/~ted/indicator-applet/now-with-me
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+16574@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

Now with Me! support.

Revision history for this message
Cody Russell (bratsche) :
review: Approve
lp://staging/~ted/indicator-applet/now-with-me updated
337. By Ted Gould

Removing 'me' from the main indicator applet.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src-session/applet-main.c'
2--- src-session/applet-main.c 2009-11-04 20:11:42 +0000
3+++ src-session/applet-main.c 2010-01-04 02:25:21 +0000
4@@ -249,7 +249,7 @@
5
6 const gchar * name;
7 while ((name = g_dir_read_name(dir)) != NULL) {
8- if (g_strcmp0(name, "libsession.so")) {
9+ if (g_strcmp0(name, "libsession.so") && g_strcmp0(name, "libme.so")) {
10 continue;
11 }
12 if (load_module(name, menubar)) {
13
14=== modified file 'src/applet-main.c'
15--- src/applet-main.c 2009-11-24 23:15:22 +0000
16+++ src/applet-main.c 2010-01-04 02:25:21 +0000
17@@ -289,6 +289,9 @@
18 if (!g_strcmp0(name, "libsession.so")) {
19 continue;
20 }
21+ if (!g_strcmp0(name, "libme.so")) {
22+ continue;
23+ }
24 if (load_module(name, menubar)) {
25 indicators_loaded++;
26 }

Subscribers

People subscribed via source and target branches

to status/vote changes: