aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-03-04 08:50:50 -0600
committerTed Gould <ted@gould.cx>2010-03-04 08:50:50 -0600
commit6f21e3c8b251a6323a8e56127d998ea77ba5b18e (patch)
tree819a92e42881f041d9d5f8484b6b8fd0d67826c6 /src
parent1af7a048d62b8616d3182a8bb48fe33e7b54d93d (diff)
parent2aeb4a3c7a9dc8821361aac9fc2db6494a7b45cd (diff)
downloadayatana-indicator-session-6f21e3c8b251a6323a8e56127d998ea77ba5b18e.tar.gz
ayatana-indicator-session-6f21e3c8b251a6323a8e56127d998ea77ba5b18e.tar.bz2
ayatana-indicator-session-6f21e3c8b251a6323a8e56127d998ea77ba5b18e.zip
Updating to new logout dialogs.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am31
-rw-r--r--src/dialog.c230
-rw-r--r--src/dialog.h64
-rw-r--r--src/gconf-helper.c (renamed from src/gtk-dialog/gconf-helper.c)0
-rw-r--r--src/gconf-helper.h (renamed from src/gtk-dialog/gconf-helper.h)0
-rw-r--r--src/gtk-dialog/Makefile.am15
-rw-r--r--src/gtk-dialog/ck-pk-helper.c222
-rw-r--r--src/gtk-dialog/ck-pk-helper.h32
-rw-r--r--src/gtk-dialog/logout-dialog.c370
-rw-r--r--src/gtk-dialog/logout-dialog.h99
-rw-r--r--src/gtk-logout-helper.c (renamed from src/gtk-dialog/gtk-logout-helper.c)36
-rw-r--r--src/session-service.c2
12 files changed, 338 insertions, 763 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index a07c782..cd525bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
-SUBDIRS = gtk-dialog
-libexec_PROGRAMS = indicator-session-service
+libexec_PROGRAMS = \
+ indicator-session-service \
+ gtk-logout-helper
###################
# Indicator Stuff
@@ -50,13 +51,37 @@ indicator_session_service_SOURCES = \
lock-helper.h \
session-service.c \
dbusmenu-shared.h \
- gtk-dialog/gconf-helper.c \
+ gconf-helper.c \
users-service-dbus.h \
users-service-dbus.c \
users-service-marshal.c
indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
+#################
+# GTK Logout Stuff
+#################
+
+gtk_logout_helper_SOURCES = \
+ gtk-logout-helper.c \
+ gconf-helper.c \
+ gconf-helper.h \
+ dialog.c \
+ dialog.h
+
+gtk_logout_helper_CFLAGS = \
+ $(SESSIONSERVICE_CFLAGS) \
+ $(GTKLOGOUTHELPER_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ -Wall -Werror \
+ -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
+
+gtk_logout_helper_LDADD = \
+ $(SESSIONSERVICE_LIBS) \
+ $(GTKLOGOUTHELPER_LIBS) \
+ $(GCONF_LIBS)
+
+
###############
# Other Stuff
###############
diff --git a/src/dialog.c b/src/dialog.c
new file mode 100644
index 0000000..deefe0b
--- /dev/null
+++ b/src/dialog.c
@@ -0,0 +1,230 @@
+/*
+A dialog to ask the user about the various logout options that
+are available.
+
+Copyright 2010 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
+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
+PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <glib/gi18n.h>
+
+#include "consolekit-manager-client.h"
+#include "dialog.h"
+
+/* Strings */
+
+static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+ /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"),
+ /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"),
+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off")
+};
+
+static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+ /* LOGOUT_DIALOG_LOGOUT, */ N_("Are you sure you want to close all programs and log out of the computer?"),
+ /* LOGOUT_DIALOG_RESTART, */ N_("Are you sure you want to close all programs and restart the computer?"),
+ /* LOGOUT_DIALOG_SHUTDOWN, */ N_("Are you sure you want to close all programs and shut down the computer?")
+};
+
+static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+ /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"),
+ /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"),
+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off")
+};
+
+/* TRANSLATORS: These strings have an ellipsis so that the user knows
+ they are also going to get a password dialog to do the action. */
+static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+ /* LOGOUT_DIALOG_LOGOUT, */ NC_("button auth", "Log Out"),
+ /* LOGOUT_DIALOG_RESTART, */ NC_("button auth", "Restart..."),
+ /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button auth", "Switch Off...")
+};
+
+/* TRANSLATORS: This button appears on the logout dialog when
+ there are updates that require restart. It will do a restart
+ in place of a log out. */
+static const gchar * restart_updates = N_("Restart Instead");
+static const gchar * restart_auth = N_("Restart Instead...");
+static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts.");
+
+static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+ /* LOGOUT_DIALOG_LOGOUT, */ "system-log-out",
+ /* LOGOUT_DIALOG_RESTART, */ "system-restart",
+ /* LOGOUT_DIALOG_SHUTDOWN, */ "system-shutdown"
+};
+
+
+
+typedef struct _LogoutDialogPrivate LogoutDialogPrivate;
+struct _LogoutDialogPrivate {
+ guint type;
+};
+
+#define LOGOUT_DIALOG_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), LOGOUT_DIALOG_TYPE, LogoutDialogPrivate))
+
+static void logout_dialog_class_init (LogoutDialogClass *klass);
+static void logout_dialog_init (LogoutDialog *self);
+static void logout_dialog_dispose (GObject *object);
+static void logout_dialog_finalize (GObject *object);
+
+G_DEFINE_TYPE (LogoutDialog, logout_dialog, GTK_TYPE_MESSAGE_DIALOG);
+
+static void
+logout_dialog_class_init (LogoutDialogClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ g_type_class_add_private (klass, sizeof (LogoutDialogPrivate));
+
+ object_class->dispose = logout_dialog_dispose;
+ object_class->finalize = logout_dialog_finalize;
+
+ return;
+}
+
+static void
+logout_dialog_init (LogoutDialog *self)
+{
+
+ return;
+}
+
+static void
+logout_dialog_dispose (GObject *object)
+{
+
+
+ G_OBJECT_CLASS (logout_dialog_parent_class)->dispose (object);
+ return;
+}
+
+static void
+logout_dialog_finalize (GObject *object)
+{
+
+
+ G_OBJECT_CLASS (logout_dialog_parent_class)->finalize (object);
+ return;
+}
+
+/* Checks for updates that would signal that a restart is
+ required for them to apply */
+static gboolean
+check_restart_required (void)
+{
+ return g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS);
+}
+
+/* Checks with console kit to see if we can do what we want */
+static gboolean
+ck_check_allowed (LogoutDialogType type)
+{
+ DBusGConnection * system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
+ g_return_val_if_fail(system_bus != NULL, TRUE);
+
+ DBusGProxy * ck_proxy = dbus_g_proxy_new_for_name (system_bus,
+ "org.freedesktop.ConsoleKit",
+ "/org/freedesktop/ConsoleKit/Manager",
+ "org.freedesktop.ConsoleKit.Manager");
+ g_return_val_if_fail(ck_proxy != NULL, TRUE);
+
+ gboolean retval = TRUE;
+ switch (type) {
+ case LOGOUT_DIALOG_TYPE_RESTART:
+ org_freedesktop_ConsoleKit_Manager_can_restart(ck_proxy, &retval, NULL);
+ break;
+ case LOGOUT_DIALOG_TYPE_SHUTDOWN:
+ org_freedesktop_ConsoleKit_Manager_can_stop(ck_proxy, &retval, NULL);
+ break;
+ default:
+ break;
+ }
+
+ g_object_unref(ck_proxy);
+
+ return retval;
+}
+
+LogoutDialog *
+logout_dialog_new (LogoutDialogType type)
+{
+ GtkWidget * image = gtk_image_new_from_icon_name(icon_strings[type], GTK_ICON_SIZE_DIALOG);
+ gtk_widget_show(image);
+
+ LogoutDialog * dialog = LOGOUT_DIALOG(g_object_new(LOGOUT_DIALOG_TYPE,
+ /* Window */
+ "icon-name", icon_strings[type],
+ "modal", TRUE,
+ "resizable", FALSE,
+ "title", _(title_strings[type]),
+ "window-position", GTK_WIN_POS_CENTER_ALWAYS,
+ /* Message Dialog */
+ "buttons", GTK_BUTTONS_NONE,
+ "image", image,
+ "message-type", GTK_MESSAGE_OTHER,
+ "text", _(body_strings[type]),
+ NULL));
+
+ gboolean allowed = FALSE;
+ if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) {
+ allowed = ck_check_allowed(LOGOUT_DIALOG_TYPE_RESTART);
+ } else {
+ allowed = ck_check_allowed(type);
+ }
+
+ gboolean restart_required = FALSE;
+ if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) {
+ restart_required = check_restart_required();
+ }
+
+ const gchar * button_text;
+ if (allowed) {
+ button_text = _(button_strings[type]);
+ } else {
+ button_text = _(button_auth_strings[type]);
+ }
+
+ if (restart_required) {
+ const gchar * restart_req;
+ if (allowed) {
+ restart_req = restart_updates;
+ } else {
+ restart_req = restart_auth;
+ }
+
+ g_object_set(dialog, "secondary-text", _(body_logout_update), NULL);
+
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+ _(restart_req), GTK_RESPONSE_HELP,
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ button_text, GTK_RESPONSE_OK,
+ NULL);
+ } else {
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+ _("Cancel"), GTK_RESPONSE_CANCEL,
+ button_text, GTK_RESPONSE_OK,
+ NULL);
+ }
+
+ gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+
+ return dialog;
+}
diff --git a/src/dialog.h b/src/dialog.h
new file mode 100644
index 0000000..18a55a7
--- /dev/null
+++ b/src/dialog.h
@@ -0,0 +1,64 @@
+/*
+A dialog to ask the user about the various logout options that
+are available.
+
+Copyright 2010 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
+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
+PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __LOGOUT_DIALOG_H__
+#define __LOGOUT_DIALOG_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define LOGOUT_DIALOG_TYPE (logout_dialog_get_type ())
+#define LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOGOUT_DIALOG_TYPE, LogoutDialog))
+#define LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), LOGOUT_DIALOG_TYPE, LogoutDialogClass))
+#define IS_LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LOGOUT_DIALOG_TYPE))
+#define IS_LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_DIALOG_TYPE))
+#define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_DIALOG_TYPE, LogoutDialogClass))
+
+typedef enum _LogoutDialogType LogoutDialogType;
+enum _LogoutDialogType {
+ LOGOUT_DIALOG_TYPE_LOG_OUT,
+ LOGOUT_DIALOG_TYPE_RESTART,
+ LOGOUT_DIALOG_TYPE_SHUTDOWN,
+ LOGOUT_DIALOG_TYPE_CNT
+};
+
+typedef struct _LogoutDialog LogoutDialog;
+typedef struct _LogoutDialogClass LogoutDialogClass;
+
+struct _LogoutDialogClass {
+ GtkMessageDialogClass parent_class;
+};
+
+struct _LogoutDialog {
+ GtkMessageDialog parent;
+};
+
+GType logout_dialog_get_type (void);
+LogoutDialog * logout_dialog_new (LogoutDialogType type);
+
+G_END_DECLS
+
+#endif
diff --git a/src/gtk-dialog/gconf-helper.c b/src/gconf-helper.c
index 9262b19..9262b19 100644
--- a/src/gtk-dialog/gconf-helper.c
+++ b/src/gconf-helper.c
diff --git a/src/gtk-dialog/gconf-helper.h b/src/gconf-helper.h
index 951bb0f..951bb0f 100644
--- a/src/gtk-dialog/gconf-helper.h
+++ b/src/gconf-helper.h
diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am
deleted file mode 100644
index 3f14d78..0000000
--- a/src/gtk-dialog/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-libexec_PROGRAMS = gtk-logout-helper
-
-gtk_logout_helper_SOURCES = \
- gtk-logout-helper.c \
- ck-pk-helper.c \
- ck-pk-helper.h \
- gconf-helper.c \
- gconf-helper.h \
- logout-dialog.c \
- logout-dialog.h
-
-gtk_logout_helper_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
-gtk_logout_helper_LDADD = $(SESSIONSERVICE_LIBS) $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS)
-
diff --git a/src/gtk-dialog/ck-pk-helper.c b/src/gtk-dialog/ck-pk-helper.c
deleted file mode 100644
index dc7d900..0000000
--- a/src/gtk-dialog/ck-pk-helper.c
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
-
-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
-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
-PURPOSE. See the GNU General Public License for more details.
-
-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 <unistd.h>
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <polkit/polkit.h>
-
-#include "logout-dialog.h"
-#include "ck-pk-helper.h"
-
-static gboolean
-ck_multiple_users (void)
-{
- DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
- g_return_val_if_fail(sbus != NULL, TRUE); /* worst case */
- DBusGProxy * proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
- "/org/freedesktop/ConsoleKit/Manager",
- "org.freedesktop.ConsoleKit.Manager");
-
- if (proxy == NULL) {
- return TRUE;
- }
-
- gboolean result;
- GPtrArray * seats = NULL;
-
- result = dbus_g_proxy_call(proxy, "GetSeats", NULL, G_TYPE_INVALID,
- dbus_g_type_get_collection("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &seats, G_TYPE_INVALID);
-
- if (!result) {
- g_warning("Unable to get the seats for ConsoleKit");
- g_object_unref(proxy);
- return TRUE;
- }
-
- gchar * this_session_id = NULL;
-
- result = dbus_g_proxy_call(proxy, "GetCurrentSession", NULL, G_TYPE_INVALID,
- DBUS_TYPE_G_OBJECT_PATH, &this_session_id, G_TYPE_INVALID);
-
- g_object_unref(proxy);
-
- if (!result) {
- g_warning("Unable to get current session from ConsoleKit");
- return TRUE;
- }
-
- proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
- this_session_id, "org.freedesktop.ConsoleKit.Session");
-
- if (proxy == NULL) {
- return TRUE;
- }
-
- guint this_session_uid;
-
- result = dbus_g_proxy_call(proxy, "GetUnixUser", NULL, G_TYPE_INVALID,
- G_TYPE_UINT, &this_session_uid, G_TYPE_INVALID);
-
- if (!result) {
- g_warning("Unable to get UID from ConsoleKit");
- return TRUE;
- }
-
- guint seat;
- gboolean multiple_users = FALSE;
- for (seat = 0; seat < seats->len; seat++) {
- gchar * seat_id = g_ptr_array_index(seats, seat);
- DBusGProxy * seat_proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
- seat_id, "org.freedesktop.ConsoleKit.Seat");
- g_free(seat_id);
-
- if (seat_proxy == NULL) {
- continue;
- }
-
- GPtrArray * sessions = NULL;
-
- gboolean result = dbus_g_proxy_call(seat_proxy,
- "GetSessions", NULL, G_TYPE_INVALID,
- dbus_g_type_get_collection("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &sessions, G_TYPE_INVALID);
-
- g_object_unref(seat_proxy);
- if (!result) {
- continue;
- }
-
- guint session;
- for (session = 0; session < sessions->len; session++) {
- gchar * session_id = g_ptr_array_index(sessions, session);
- if (g_strcmp0(this_session_id, session_id) == 0) {
- continue;
- }
- DBusGProxy * session_proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
- session_id, "org.freedesktop.ConsoleKit.Session");
- g_free(session_id);
-
- if (session_proxy == NULL) {
- continue;
- }
-
- guint session_uid;
- result = dbus_g_proxy_call(session_proxy, "GetUnixUser", NULL, G_TYPE_INVALID,
- G_TYPE_UINT, &session_uid, G_TYPE_INVALID);
- g_object_unref(session_proxy);
-
- if (!result) {
- continue;
- }
-
- if (session_uid != this_session_uid) {
- multiple_users = TRUE;
- break;
- }
- }
-
- g_ptr_array_free(sessions, TRUE);
-
- if (multiple_users) {
- break;
- }
- }
-
- g_ptr_array_free(seats, TRUE);
- g_object_unref(proxy);
- g_free(this_session_id);
-
- return multiple_users;
-}
-
-gboolean
-pk_require_auth (LogoutDialogAction action) {
- if (action == LOGOUT_DIALOG_LOGOUT) {
- return FALSE;
- }
-
- gchar * pk_action;
- if (ck_multiple_users()) {
- if (action == LOGOUT_DIALOG_RESTART) {
- pk_action = "org.freedesktop.consolekit.system.restart-multiple-users";
- } else {
- pk_action = "org.freedesktop.consolekit.system.stop-multiple-users";
- }
- } else {
- if (action == LOGOUT_DIALOG_RESTART) {
- pk_action = "org.freedesktop.consolekit.system.restart";
- } else {
- pk_action = "org.freedesktop.consolekit.system.stop";
- }
- }
-
- PolkitAuthorizationResult *polres = NULL;
- gboolean ret = FALSE;
- if (pk_can_do_action(pk_action, &polres)) {
- if (polkit_authorization_result_get_is_challenge (polres)) {
- ret = TRUE;
- }
- g_debug ("pk_require_auth(%s): authorized, is_challenge: %i", pk_action, ret);
- } else {
- g_debug ("pk_require_auth(%s): not authorized", pk_action);
- }
- if (polres) {
- g_object_unref (polres);
- }
- return ret;
-}
-
-gboolean
-pk_can_do_action (const gchar *action_id, PolkitAuthorizationResult ** pol_result)
-{
- PolkitAuthority *authority;
- PolkitSubject *subject;
- PolkitAuthorizationResult *result;
- gboolean ret;
-
- authority = polkit_authority_get();
- if (!authority) {
- g_warning ("Could not get PolicyKit authority instance");
- return FALSE;
- }
- subject = polkit_unix_process_new (getpid());
-
- result = polkit_authority_check_authorization_sync (authority, subject, action_id, NULL, 0, NULL, NULL);
- g_object_unref (authority);
-
- ret = FALSE;
- if (result) {
- ret = polkit_authorization_result_get_is_authorized (result) ||
- polkit_authorization_result_get_is_challenge (result);
- g_debug ("pk_can_do_action(%s): %i", action_id, ret);
- } else {
- g_warning ("pk_can_do_action(%s): check_authorization returned NULL", action_id);
- }
- if (pol_result) {
- *pol_result = result;
- } else {
- g_object_unref (result);
- }
- return ret;
-
-}
diff --git a/src/gtk-dialog/ck-pk-helper.h b/src/gtk-dialog/ck-pk-helper.h
deleted file mode 100644
index 501a8c8..0000000
--- a/src/gtk-dialog/ck-pk-helper.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
-
-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
-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
-PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef __CK_PK_HELPER_H__
-#define __CK_PK_HELPER_H__ 1
-
-#include <polkit/polkit.h>
-
-gboolean pk_require_auth (LogoutDialogAction action);
-gboolean pk_can_do_action (const gchar *action_id, PolkitAuthorizationResult ** pol_result);
-
-#endif /* __CK_PK_HELPER__ */
diff --git a/src/gtk-dialog/logout-dialog.c b/src/gtk-dialog/logout-dialog.c
deleted file mode 100644
index 07fc6df..0000000
--- a/src/gtk-dialog/logout-dialog.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/*
- * libgksuui -- Gtk+ widget and convenience functions for requesting passwords
- * Copyright (C) 2004 Gustavo Noronha Silva
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-#include <string.h>
-#include <math.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <glib/gi18n.h>
-#include <X11/XKBlib.h>
-
-#include "logout-dialog.h"
-#include "ck-pk-helper.h"
-
-enum {
- PROP_ZERO,
- PROP_ACTION
-};
-
-
-static void
-logout_dialog_class_init (LogoutDialogClass *klass);
-
-static void
-logout_dialog_init (LogoutDialog *logout_dialog);
-
-static void
-set_property (GObject * object, guint param_id, const GValue * value, GParamSpec *pspec);
-
-static void
-get_property (GObject * object, guint param_id, GValue * value, GParamSpec *pspec);
-
-static gboolean
-timer_cb (gpointer data);
-
-static void
-show_cb (GtkWidget * widget, gpointer data);
-
-static void
-check_restart (LogoutDialog * dialog);
-
-static gchar*
-get_plural_string (LogoutDialog * dialog);
-
-static const gchar * title_strings[LOGOUT_DIALOG_ACTION_CNT] = {
- /* LOGOUT_DIALOG_LOGOUT, */ NC_("title", "Log Out"),
- /* LOGOUT_DIALOG_RESTART, */ NC_("title", "Restart"),
- /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("title", "Switch Off")
-};
-
-static const gchar * button_strings[LOGOUT_DIALOG_ACTION_CNT] = {
- /* LOGOUT_DIALOG_LOGOUT, */ NC_("button", "Log Out"),
- /* LOGOUT_DIALOG_RESTART, */ NC_("button", "Restart"),
- /* LOGOUT_DIALOG_SHUTDOWN, */ NC_("button", "Switch Off")
-};
-
-static const gchar * restart_auth = N_("Restart...");
-
-static const gchar * body_logout_update = N_("You recently installed updates which will only take effect after a restart. Restart to apply software updates.");
-
-static const gchar * icon_strings[LOGOUT_DIALOG_ACTION_CNT] = {
- /* LOGOUT_DIALOG_LOGOUT, */ "system-log-out",
- /* LOGOUT_DIALOG_RESTART, */ "system-restart",
- /* LOGOUT_DIALOG_SHUTDOWN, */ "system-shutdown"
-};
-
-GType
-logout_dialog_get_type (void)
-{
- static GType type = 0;
-
- if (type == 0)
- {
- static const GTypeInfo info =
- {
- sizeof (LogoutDialogClass), /* size of class */
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) logout_dialog_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (LogoutDialog), /* size of object */
- 0, /* n_preallocs */
- (GInstanceInitFunc) logout_dialog_init /* instance_init */
- };
- type = g_type_register_static (gtk_dialog_get_type (),
- "LogoutDialogType",
- &info, 0);
- }
-
- return type;
-}
-
-static gchar*
-get_plural_string (LogoutDialog * dialog)
-{
- static gchar *plural_string = "";
-
- switch (dialog->action)
- {
- case LOGOUT_DIALOG_LOGOUT:
- plural_string = ngettext("You will be logged out in %d second.",
- "You will be logged out in %d seconds.",
- dialog->timeout);
- break;
- case LOGOUT_DIALOG_RESTART:
- plural_string = ngettext("The computer will restart in %d second.",
- "The computer will restart in %d seconds.",
- dialog->timeout);
- break;
- case LOGOUT_DIALOG_SHUTDOWN:
- plural_string = ngettext("The computer will switch off in %d second.",
- "The computer will switch off in %d seconds.",
- dialog->timeout);
- break;
- default:
- break;
- }
-
- return plural_string;
-}
-
-static void
-logout_dialog_class_init (LogoutDialogClass *klass)
-{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
- gobject_class->set_property = set_property;
- gobject_class->get_property = get_property;
-
- g_object_class_install_property(gobject_class, PROP_ACTION,
- g_param_spec_int("action", NULL, NULL,
- LOGOUT_DIALOG_LOGOUT, LOGOUT_DIALOG_SHUTDOWN,
- LOGOUT_DIALOG_LOGOUT, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
- return;
-}
-
-static void
-set_property (GObject * object, guint param_id, const GValue * value, GParamSpec *pspec)
-{
- g_return_if_fail(param_id == PROP_ACTION);
-
- LogoutDialog * dialog = LOGOUT_DIALOG(object);
- dialog->action = (LogoutDialogAction)g_value_get_int(value);
-
- gtk_image_set_from_icon_name(GTK_IMAGE(dialog->image), icon_strings[dialog->action], GTK_ICON_SIZE_DIALOG);
- gtk_window_set_title (GTK_WINDOW(dialog), _(title_strings[dialog->action]));
- gtk_window_set_icon_name (GTK_WINDOW(dialog), icon_strings[dialog->action]);
- gtk_widget_hide(dialog->message);
- gtk_button_set_label(GTK_BUTTON(dialog->ok_button), _(button_strings[dialog->action]));
-
- gchar * timeouttxt = g_strdup_printf(get_plural_string(dialog), dialog->timeout);
- gtk_label_set_text(GTK_LABEL(dialog->timeout_text), timeouttxt);
- g_free(timeouttxt);
-
- check_restart(dialog);
-
- return;
-}
-
-static void
-get_property (GObject * object, guint param_id, GValue * value, GParamSpec *pspec)
-{
- g_return_if_fail(param_id == PROP_ACTION);
- g_value_set_int(value, LOGOUT_DIALOG(object)->action);
-}
-
-static gboolean
-timer_cb (gpointer data)
-{
- LogoutDialog * dialog = LOGOUT_DIALOG(data);
-
- if (dialog->timeout == 0) {
- gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- dialog->timerfunc = 0;
- return FALSE;
- } else {
- dialog->timeout--;
-
- gchar * timeouttxt = g_strdup_printf(get_plural_string(dialog), dialog->timeout);
- gtk_label_set_text(GTK_LABEL(dialog->timeout_text), timeouttxt);
- g_free(timeouttxt);
- }
-
- return TRUE;
-}
-
-static void
-show_cb (GtkWidget * widget, gpointer data)
-{
- LogoutDialog * dialog = LOGOUT_DIALOG(widget);
-
- if (dialog->timerfunc != 0) {
- g_source_remove(dialog->timerfunc);
- dialog->timerfunc = 0;
- }
-
- dialog->timerfunc = g_timeout_add_seconds(1, timer_cb, dialog);
- return;
-}
-
-static void
-check_restart (LogoutDialog * dialog)
-{
- if (dialog->action != LOGOUT_DIALOG_LOGOUT) {
- return;
- }
-
- if (g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS)) {
- if (pk_can_do_action("org.freedesktop.consolekit.system.restart", NULL) ||
- pk_can_do_action("org.freedesktop.consolekit.system.restart-multiple-users", NULL)) {
-
- gtk_label_set_text(GTK_LABEL(dialog->message), _(body_logout_update));
- gtk_widget_show(dialog->message);
- if (pk_require_auth(LOGOUT_DIALOG_RESTART)) {
- gtk_button_set_label(GTK_BUTTON(dialog->restart_button), _(restart_auth));
- } else {
- gtk_button_set_label(GTK_BUTTON(dialog->restart_button), _(button_strings[LOGOUT_DIALOG_RESTART]));
- }
- gtk_widget_show(dialog->restart_button);
- }
- }
-
- return;
-}
-
-static gboolean
-focus_out_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
-{
- gtk_window_present (GTK_WINDOW(widget));
- return TRUE;
-}
-
-static void
-logout_dialog_init (LogoutDialog *logout_dialog)
-{
- GtkDialog *dialog;
- gint border_width = 6;
-
- logout_dialog->timeout = 60;
- logout_dialog->timerfunc = 0;
-
- /* dialog window */
- dialog = GTK_DIALOG(logout_dialog);
-
- /* make sure that our window will always have the focus */
- g_signal_connect (G_OBJECT(dialog), "focus-out-event",
- G_CALLBACK(focus_out_cb), NULL);
-
- logout_dialog->main_vbox = dialog->vbox;
-
- gtk_window_set_title (GTK_WINDOW(logout_dialog), "");
- gtk_dialog_set_has_separator (GTK_DIALOG(logout_dialog), FALSE);
- gtk_container_set_border_width (GTK_CONTAINER(logout_dialog), border_width);
- gtk_box_set_spacing (GTK_BOX(logout_dialog->main_vbox), 12);
- gtk_window_set_resizable (GTK_WINDOW(logout_dialog), FALSE);
-
- gtk_window_stick(GTK_WINDOW(logout_dialog));
- gtk_window_set_keep_above(GTK_WINDOW(logout_dialog), TRUE);
- gtk_widget_realize(GTK_WIDGET(logout_dialog));
- /* remove superfluous window buttons */
- gdk_window_set_functions (GTK_WIDGET(logout_dialog)->window, 0);
-
- /* center window */
- gtk_window_set_position (GTK_WINDOW(logout_dialog), GTK_WIN_POS_CENTER);
-
- /* the action buttons */
- /* the cancel button */
- logout_dialog->restart_button = gtk_dialog_add_button (dialog,
- GTK_STOCK_HELP,
- GTK_RESPONSE_HELP);
- gtk_button_set_label(GTK_BUTTON(logout_dialog->restart_button), _(button_strings[LOGOUT_DIALOG_RESTART]));
- gtk_widget_hide(logout_dialog->restart_button);
-
- /* the cancel button */
- logout_dialog->cancel_button = gtk_dialog_add_button (dialog,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
- /* the ok button */
- logout_dialog->ok_button = gtk_dialog_add_button (dialog,
- GTK_STOCK_OK,
- GTK_RESPONSE_OK);
- gtk_widget_grab_default (logout_dialog->ok_button);
-
- /* Window Title and Icon */
- gtk_window_set_title (GTK_WINDOW(logout_dialog), _(title_strings[logout_dialog->action]));
- gtk_window_set_icon_name (GTK_WINDOW(logout_dialog), icon_strings[logout_dialog->action]);
-
- /* hbox */
- logout_dialog->hbox = gtk_hbox_new (FALSE, 12);
- gtk_container_set_border_width (GTK_CONTAINER(logout_dialog->hbox), 6);
- gtk_box_pack_start (GTK_BOX(logout_dialog->main_vbox),
- logout_dialog->hbox, FALSE, FALSE, 0);
- gtk_widget_show (logout_dialog->hbox);
-
- /* image */
- logout_dialog->image =
- gtk_image_new_from_icon_name (icon_strings[logout_dialog->action],
- GTK_ICON_SIZE_DIALOG);
- gtk_misc_set_alignment (GTK_MISC(logout_dialog->image), 0.5, 0);
- gtk_box_pack_start (GTK_BOX(logout_dialog->hbox), logout_dialog->image,
- FALSE, FALSE, 0);
- gtk_widget_show (logout_dialog->image);
-
- /* vbox for text */
- logout_dialog->vbox_text = gtk_vbox_new(FALSE, 12);
- gtk_box_pack_start(GTK_BOX(logout_dialog->hbox), logout_dialog->vbox_text, TRUE, TRUE, 0);
- gtk_widget_show(logout_dialog->vbox_text);
-
- /* Message */
- logout_dialog->message = gtk_label_new("");
- gtk_label_set_line_wrap(GTK_LABEL(logout_dialog->message), TRUE);
- gtk_label_set_single_line_mode(GTK_LABEL(logout_dialog->message), FALSE);
- gtk_label_set_selectable(GTK_LABEL(logout_dialog->message), TRUE);
- gtk_misc_set_alignment (GTK_MISC(logout_dialog->message), 0.0, 0.0);
- gtk_box_pack_start(GTK_BOX(logout_dialog->vbox_text), logout_dialog->message, TRUE, TRUE, 0);
- gtk_widget_show(logout_dialog->message);
-
- /* timeout */
- logout_dialog->timeout_text = gtk_label_new("");
- gtk_label_set_line_wrap(GTK_LABEL(logout_dialog->timeout_text), TRUE);
- gtk_label_set_single_line_mode(GTK_LABEL(logout_dialog->timeout_text), FALSE);
- gtk_label_set_selectable(GTK_LABEL(logout_dialog->timeout_text), FALSE);
- gtk_misc_set_alignment (GTK_MISC(logout_dialog->timeout_text), 0.0, 0.5);
- gtk_box_pack_start(GTK_BOX(logout_dialog->vbox_text), logout_dialog->timeout_text, TRUE, TRUE, 0);
- gtk_widget_show(logout_dialog->timeout_text);
-
- g_signal_connect(G_OBJECT(logout_dialog), "show", G_CALLBACK(show_cb), logout_dialog);
-
- return;
-}
-
-/**
- * logout_dialog_new:
- *
- * Creates a new #LogoutDialog.
- *
- * Returns: the new #LogoutDialog
- */
-GtkWidget*
-logout_dialog_new (LogoutDialogAction action)
-{
- LogoutDialog * dialog = g_object_new (LOGOUT_TYPE_DIALOG, "action", action, NULL);
- return GTK_WIDGET(dialog);
-}
-
-LogoutDialogAction
-logout_dialog_get_action (LogoutDialog * dialog)
-{
- return dialog->action;
-}
-
diff --git a/src/gtk-dialog/logout-dialog.h b/src/gtk-dialog/logout-dialog.h
deleted file mode 100644
index 8b0ff09..0000000
--- a/src/gtk-dialog/logout-dialog.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * libgksuui -- Gtk+ widget and convenience functions for requesting passwords
- * Copyright (C) 2004 Gustavo Noronha Silva
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- */
-
-#ifndef __LOGOUT_DIALOG_H__
-#define __LOGOUT_DIALOG_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define LOGOUT_TYPE_DIALOG (logout_dialog_get_type ())
-#define LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LOGOUT_TYPE_DIALOG, LogoutDialog))
-#define LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LOGOUT_TYPE_DIALOG, LogoutDialogClass))
-#define LOGOUT_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LOGOUT_TYPE_DIALOG))
-#define LOGOUT_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_TYPE_CONTEXT))
-#define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_TYPE_DIALOG, LogoutDialogClass))
-
-typedef struct _LogoutDialogClass LogoutDialogClass;
-typedef struct _LogoutDialog LogoutDialog;
-typedef enum _LogoutDialogAction LogoutDialogAction;
-
-enum _LogoutDialogAction {
- LOGOUT_DIALOG_LOGOUT,
- LOGOUT_DIALOG_RESTART,
- LOGOUT_DIALOG_SHUTDOWN,
- LOGOUT_DIALOG_ACTION_CNT
-};
-
-struct _LogoutDialogClass
-{
- GtkDialogClass parent_class;
-};
-
-/**
- * LogoutDialog:
- * @dialog: parent widget
- * @main_vbox: GtkDialog's vbox
- * @hbox: box to separate the image of the right-side widgets
- * @image: the authorization image, left-side widget
- * @entry_vbox: right-side widgets container
- * @label: message describing what is required from the user,
- * right-side widget
- * @entry: place to type the password in, right-side widget
- * @ok_button: OK button of the dialog
- * @cancel_button: Cancel button of the dialog
- *
- * Convenience widget based on #GtkDialog to request a password.
- */
-struct _LogoutDialog
-{
- GtkDialog dialog;
-
- GtkWidget *main_vbox;
- GtkWidget *hbox;
- GtkWidget *image;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
- GtkWidget *restart_button;
- GtkWidget *vbox_text;
- GtkWidget *message;
- GtkWidget *timeout_text;
-
- LogoutDialogAction action;
-
- /* private */
- gchar * timeout_result;
- guint timeout;
- guint timerfunc;
-};
-
-GType
-logout_dialog_get_type (void);
-
-GtkWidget*
-logout_dialog_new (LogoutDialogAction action);
-
-LogoutDialogAction
-logout_dialog_get_action (LogoutDialog * widget);
-
-G_END_DECLS
-
-#endif
diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-logout-helper.c
index 7453ce4..64fba14 100644
--- a/src/gtk-dialog/gtk-logout-helper.c
+++ b/src/gtk-logout-helper.c
@@ -25,12 +25,11 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <glib.h>
#include <gtk/gtk.h>
#include <dbus/dbus-glib.h>
-#include "logout-dialog.h"
-#include "ck-pk-helper.h"
+#include "dialog.h"
#include "gconf-helper.h"
static void
-consolekit_fallback (LogoutDialogAction action)
+consolekit_fallback (LogoutDialogType action)
{
DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
g_return_if_fail(sbus != NULL); /* worst case */
@@ -46,16 +45,16 @@ consolekit_fallback (LogoutDialogAction action)
GError * error = NULL;
switch (action) {
- case LOGOUT_DIALOG_LOGOUT:
+ case LOGOUT_DIALOG_TYPE_LOG_OUT:
g_warning("Unable to fallback to ConsoleKit for logout as it's a session issue. We need some sort of session handler.");
break;
- case LOGOUT_DIALOG_SHUTDOWN:
+ case LOGOUT_DIALOG_TYPE_SHUTDOWN:
dbus_g_proxy_call(proxy,
"Stop",
&error,
G_TYPE_INVALID);
break;
- case LOGOUT_DIALOG_RESTART:
+ case LOGOUT_DIALOG_TYPE_RESTART:
dbus_g_proxy_call(proxy,
"Restart",
&error,
@@ -77,7 +76,7 @@ consolekit_fallback (LogoutDialogAction action)
}
static void
-session_action (LogoutDialogAction action)
+session_action (LogoutDialogType action)
{
DBusGConnection * sbus;
DBusGProxy * sm_proxy;
@@ -104,13 +103,13 @@ session_action (LogoutDialogAction action)
g_clear_error (&error);
- if (action == LOGOUT_DIALOG_LOGOUT) {
+ if (action == LOGOUT_DIALOG_TYPE_LOG_OUT) {
res = dbus_g_proxy_call_with_timeout (sm_proxy, "Logout", INT_MAX, &error,
G_TYPE_UINT, 1, G_TYPE_INVALID, G_TYPE_INVALID);
- } else if (action == LOGOUT_DIALOG_SHUTDOWN) {
+ } else if (action == LOGOUT_DIALOG_TYPE_SHUTDOWN) {
res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestShutdown", INT_MAX, &error,
G_TYPE_INVALID, G_TYPE_INVALID);
- } else if (action == LOGOUT_DIALOG_RESTART) {
+ } else if (action == LOGOUT_DIALOG_TYPE_RESTART) {
res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestReboot", INT_MAX, &error,
G_TYPE_INVALID, G_TYPE_INVALID);
} else {
@@ -134,26 +133,26 @@ session_action (LogoutDialogAction action)
return;
}
-static LogoutDialogAction type = LOGOUT_DIALOG_LOGOUT;
+static LogoutDialogType type = LOGOUT_DIALOG_TYPE_LOG_OUT;
static gboolean
option_logout (const gchar * arg, const gchar * value, gpointer data, GError * error)
{
- type = LOGOUT_DIALOG_LOGOUT;
+ type = LOGOUT_DIALOG_TYPE_LOG_OUT;
return TRUE;
}
static gboolean
option_shutdown (const gchar * arg, const gchar * value, gpointer data, GError * error)
{
- type = LOGOUT_DIALOG_SHUTDOWN;
+ type = LOGOUT_DIALOG_TYPE_SHUTDOWN;
return TRUE;
}
static gboolean
option_restart (const gchar * arg, const gchar * value, gpointer data, GError * error)
{
- type = LOGOUT_DIALOG_RESTART;
+ type = LOGOUT_DIALOG_TYPE_RESTART;
return TRUE;
}
@@ -193,13 +192,8 @@ main (int argc, char * argv[])
INDICATOR_ICONS_DIR);
GtkWidget * dialog = NULL;
- /* TODO: We're disabling PolicyKit checking here because there
- is a bug in ConsoleKit where the dialog doesn't come up until
- the session is entirely closed. Stupid, but it's better than
- not getting a dialog at all. */
- /* if (!pk_require_auth(type) && !supress_confirmations()) { */
if (!supress_confirmations()) {
- dialog = logout_dialog_new(type);
+ dialog = GTK_WIDGET(logout_dialog_new(type));
}
if (dialog != NULL) {
@@ -207,7 +201,7 @@ main (int argc, char * argv[])
gtk_widget_hide(dialog);
if (response == GTK_RESPONSE_HELP) {
- type = LOGOUT_DIALOG_RESTART;
+ type = LOGOUT_DIALOG_TYPE_RESTART;
response = GTK_RESPONSE_OK;
}
diff --git a/src/session-service.c b/src/session-service.c
index eb1966e..88a79fe 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -40,7 +40,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "dbus-shared-names.h"
#include "dbusmenu-shared.h"
-#include "gtk-dialog/gconf-helper.h"
+#include "gconf-helper.h"
#include "users-service-dbus.h"
#include "lock-helper.h"