diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | src/gtk-dialog/gtk-logout-helper.c | 8 | ||||
| -rw-r--r-- | src/session-service.c | 7 | ||||
| -rw-r--r-- | src/status-service.c | 7 | ||||
| -rw-r--r-- | src/users-service.c | 8 |
5 files changed, 32 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 382d712..2883c9c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,8 @@ -indicator-session (0.1.3-0ubuntu2~ppa1~design2) karmic; urgency=low +indicator-session (0.1.3-0ubuntu2~ppa1) UNRELEASED; urgency=low - * Fixing more labels + * Fixes to issues brought up by the design team. - -- Ted Gould <ted@ubuntu.com> Wed, 16 Sep 2009 10:14:11 -0500 - -indicator-session (0.1.3-0ubuntu2~ppa1~design1) karmic; urgency=low - - * Fixes for the design team. - - -- Ted Gould <ted@ubuntu.com> Mon, 14 Sep 2009 21:35:16 -0500 + -- Ted Gould <ted@ubuntu.com> Wed, 16 Sep 2009 16:06:24 -0500 indicator-session (0.1.3-0ubuntu1) karmic; urgency=low diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index e6a9ef8..0c03e86 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ - +#include <config.h> #include <glib.h> #include <gtk/gtk.h> #include <dbus/dbus-glib.h> @@ -121,6 +121,12 @@ main (int argc, char * argv[]) { gtk_init(&argc, &argv); + /* Setting up i18n and gettext. Apparently, we need + all of these. */ + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + textdomain (GETTEXT_PACKAGE); + GError * error = NULL; GOptionContext * context = g_option_context_new(" - logout of the current session"); g_option_context_add_main_entries(context, options, "gtk-logout-helper"); diff --git a/src/session-service.c b/src/session-service.c index 58eb4cf..9c3c4ef 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -21,6 +21,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <glib/gi18n.h> @@ -282,6 +283,12 @@ main (int argc, char ** argv) { g_type_init(); + /* Setting up i18n and gettext. Apparently, we need + all of these. */ + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + textdomain (GETTEXT_PACKAGE); + DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); GError * error = NULL; diff --git a/src/status-service.c b/src/status-service.c index c7ef20b..fe02dd0 100644 --- a/src/status-service.c +++ b/src/status-service.c @@ -20,6 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> #include <sys/types.h> #include <pwd.h> @@ -223,6 +224,12 @@ main (int argc, char ** argv) { g_type_init(); + /* Setting up i18n and gettext. Apparently, we need + all of these. */ + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + textdomain (GETTEXT_PACKAGE); + DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); GError * error = NULL; diff --git a/src/users-service.c b/src/users-service.c index 6c44781..7ad1732 100644 --- a/src/users-service.c +++ b/src/users-service.c @@ -20,6 +20,8 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <config.h> + #include <unistd.h> #include <glib/gi18n.h> @@ -165,6 +167,12 @@ main (int argc, char ** argv) { g_type_init(); + /* Setting up i18n and gettext. Apparently, we need + all of these. */ + setlocale (LC_ALL, ""); + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + textdomain (GETTEXT_PACKAGE); + session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); GError * error = NULL; |