ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/indicator-applet/now-with-me/+merge/16574
  proposed by: Ted Gould (ted)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 336 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: applet
timestamp: Mon 2010-01-04 14:03:27 -0600
message:
  Adding in support for 'me' -- basically putting it in the right indicator applet incarnation.
modified:
  src-session/applet-main.c
  src/applet-main.c


--
lp:indicator-applet
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet

Your team ayatana-commits is subscribed to branch lp:indicator-applet.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet/+edit-subscription.

=== modified file 'src-session/applet-main.c'
--- src-session/applet-main.c	2009-11-04 20:11:42 +0000
+++ src-session/applet-main.c	2009-12-24 16:43:37 +0000
@@ -249,7 +249,7 @@
 
 		const gchar * name;
 		while ((name = g_dir_read_name(dir)) != NULL) {
-			if (g_strcmp0(name, "libsession.so")) {
+			if (g_strcmp0(name, "libsession.so") && g_strcmp0(name, "libme.so")) {
 				continue;
 			}
 			if (load_module(name, menubar)) {

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2009-11-24 23:15:22 +0000
+++ src/applet-main.c	2010-01-04 02:23:10 +0000
@@ -289,6 +289,9 @@
 			if (!g_strcmp0(name, "libsession.so")) {
 				continue;
 			}
+			if (!g_strcmp0(name, "libme.so")) {
+				continue;
+			}
 			if (load_module(name, menubar)) {
 				indicators_loaded++;
 			}