diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2009-09-24 18:11:10 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2009-09-24 18:11:10 -0400 |
commit | 8bbcf87cf6cd876eacec968438d1622e3b362225 (patch) | |
tree | d955b77d089152549107434f38df5dd12abddefb /src/status-service.c | |
parent | 86c162bb5ae1eca498296d7890789130b9eea2a4 (diff) | |
parent | 2bddafc048379759d720f250739c59fcad7f6249 (diff) | |
download | ayatana-indicator-session-8bbcf87cf6cd876eacec968438d1622e3b362225.tar.gz ayatana-indicator-session-8bbcf87cf6cd876eacec968438d1622e3b362225.tar.bz2 ayatana-indicator-session-8bbcf87cf6cd876eacec968438d1622e3b362225.zip |
* Upstream release 0.1.5 (LP: #436223)
* PolicyKit-1 support (LP: #418643)
* GDM User list support (LP: #422052)
* MissionControl5 support (LP: #427643)
* Better locking of the screensaver (LP: #428115)
* debian/control: Adding in a libempathy-dev build dependency
as it's now required by upstream.
* Removing patches 01_polkit-1.patch and 99_autoreconf.patch
as they were merged upstream.
Diffstat (limited to 'src/status-service.c')
-rw-r--r-- | src/status-service.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/status-service.c b/src/status-service.c index 0cb9185..a448ada 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -7,16 +7,16 @@ Copyright 2009 Canonical Ltd. Authors: Ted Gould <ted@canonical.com> -This program is free software: you can redistribute it and/or modify it -under the terms of the GNU General Public License version 3, as published +This program is free software: you can redistribute it and/or modify it +under the terms of the GNU General Public License version 3, as published by the Free Software Foundation. -This program is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranties of -MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR +This program is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranties of +MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. -You should have received a copy of the GNU General Public License along +You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -40,12 +40,14 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "status-service-dbus.h" #include "status-provider.h" +#include "status-provider-mc5.h" #include "status-provider-pidgin.h" #include "status-provider-telepathy.h" typedef StatusProvider * (*newfunc) (void); -#define STATUS_PROVIDER_CNT 2 +#define STATUS_PROVIDER_CNT 3 static newfunc status_provider_newfuncs[STATUS_PROVIDER_CNT] = { + status_provider_mc5_new, status_provider_pidgin_new, status_provider_telepathy_new }; @@ -238,12 +240,12 @@ main (int argc, char ** argv) if (!org_freedesktop_DBus_request_name(bus_proxy, INDICATOR_STATUS_DBUS_NAME, 0, &nameret, &error)) { g_error("Unable to call to request name"); return 1; - } + } if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { g_error("Unable to get name"); return 1; - } + } g_idle_add(build_providers, NULL); |