gnome-session r4803 - in branches/dbus_based: . gnome-session
- From: mccann svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-session r4803 - in branches/dbus_based: . gnome-session
- Date: Tue, 15 Jul 2008 19:22:40 +0000 (UTC)
Author: mccann
Date: Tue Jul 15 19:22:40 2008
New Revision: 4803
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4803&view=rev
Log:
2008-07-15 William Jon McCann <jmccann redhat com>
* gnome-session/Makefile.am:
* gnome-session/gsm-inhibit-dialog.c (lock_screen), (on_response),
(gsm_inhibit_dialog_set_action), (find_inhibitor), (add_inhibitor),
(update_dialog_text), (on_store_inhibitor_added),
(on_store_inhibitor_removed),
(gsm_inhibit_dialog_set_inhibitor_store),
(gsm_inhibit_dialog_set_property),
(gsm_inhibit_dialog_get_property), (name_cell_data_func),
(add_to_model), (populate_model), (setup_dialog),
(gsm_inhibit_dialog_constructor), (gsm_inhibit_dialog_dispose),
(gsm_inhibit_dialog_class_init), (gsm_inhibit_dialog_init),
(gsm_inhibit_dialog_finalize), (gsm_inhibit_dialog_new):
* gnome-session/gsm-inhibit-dialog.h:
* gnome-session/gsm-logout-inhibit-dialog.c:
* gnome-session/gsm-logout-inhibit-dialog.glade:
* gnome-session/gsm-logout-inhibit-dialog.h:
* gnome-session/gsm-manager.c (inhibit_dialog_response),
(request_reboot), (request_shutdown), (request_suspend),
(request_hibernate), (request_logout), (request_switch_user):
* gnome-session/test-client-dbus.c (register_client):
Rename logout_inhibit_dialog to inhibit_dialog.
Added:
branches/dbus_based/gnome-session/gsm-inhibit-dialog.c (contents, props changed)
- copied, changed from r4801, /branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.c
branches/dbus_based/gnome-session/gsm-inhibit-dialog.glade (props changed)
- copied unchanged from r4801, /branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.glade
branches/dbus_based/gnome-session/gsm-inhibit-dialog.h (contents, props changed)
- copied, changed from r4801, /branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.h
Removed:
branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.c
branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.glade
branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.h
Modified:
branches/dbus_based/ChangeLog
branches/dbus_based/gnome-session/Makefile.am
branches/dbus_based/gnome-session/gsm-manager.c
branches/dbus_based/gnome-session/test-client-dbus.c
Modified: branches/dbus_based/gnome-session/Makefile.am
==============================================================================
--- branches/dbus_based/gnome-session/Makefile.am (original)
+++ branches/dbus_based/gnome-session/Makefile.am Tue Jul 15 19:22:40 2008
@@ -26,7 +26,7 @@
gladedir = $(pkgdatadir)
glade_DATA = \
- gsm-logout-inhibit-dialog.glade \
+ gsm-inhibit-dialog.glade \
$(NULL)
test_inhibit_SOURCES = \
@@ -73,8 +73,8 @@
gsm-consolekit.h \
gsm-logout-dialog.h \
gsm-logout-dialog.c \
- gsm-logout-inhibit-dialog.h \
- gsm-logout-inhibit-dialog.c \
+ gsm-inhibit-dialog.h \
+ gsm-inhibit-dialog.c \
gsm-power-manager.h \
gsm-power-manager.c \
gconf.c \
Copied: branches/dbus_based/gnome-session/gsm-inhibit-dialog.c (from r4801, /branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.c)
==============================================================================
--- /branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.c (original)
+++ branches/dbus_based/gnome-session/gsm-inhibit-dialog.c Tue Jul 15 19:22:40 2008
@@ -33,11 +33,11 @@
#include <glade/glade-xml.h>
#include <gconf/gconf-client.h>
-#include "gsm-logout-inhibit-dialog.h"
+#include "gsm-inhibit-dialog.h"
#include "eggdesktopfile.h"
#include "util.h"
-#define GSM_LOGOUT_INHIBIT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_LOGOUT_INHIBIT_DIALOG, GsmLogoutInhibitDialogPrivate))
+#define GSM_INHIBIT_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialogPrivate))
#define GLADE_XML_FILE "gsm-logout-inhibit-dialog.glade"
@@ -47,7 +47,7 @@
#define DIALOG_RESPONSE_LOCK_SCREEN 1
-struct GsmLogoutInhibitDialogPrivate
+struct GsmInhibitDialogPrivate
{
GladeXML *xml;
int action;
@@ -69,14 +69,14 @@
NUMBER_OF_COLUMNS
};
-static void gsm_logout_inhibit_dialog_class_init (GsmLogoutInhibitDialogClass *klass);
-static void gsm_logout_inhibit_dialog_init (GsmLogoutInhibitDialog *logout_inhibit_dialog);
-static void gsm_logout_inhibit_dialog_finalize (GObject *object);
+static void gsm_inhibit_dialog_class_init (GsmInhibitDialogClass *klass);
+static void gsm_inhibit_dialog_init (GsmInhibitDialog *inhibit_dialog);
+static void gsm_inhibit_dialog_finalize (GObject *object);
-G_DEFINE_TYPE (GsmLogoutInhibitDialog, gsm_logout_inhibit_dialog, GTK_TYPE_DIALOG)
+G_DEFINE_TYPE (GsmInhibitDialog, gsm_inhibit_dialog, GTK_TYPE_DIALOG)
static void
-lock_screen (GsmLogoutInhibitDialog *dialog)
+lock_screen (GsmInhibitDialog *dialog)
{
GError *error;
error = NULL;
@@ -88,7 +88,7 @@
}
static void
-on_response (GsmLogoutInhibitDialog *dialog,
+on_response (GsmInhibitDialog *dialog,
gint response_id)
{
switch (response_id) {
@@ -102,21 +102,21 @@
}
static void
-gsm_logout_inhibit_dialog_set_action (GsmLogoutInhibitDialog *dialog,
+gsm_inhibit_dialog_set_action (GsmInhibitDialog *dialog,
int action)
{
dialog->priv->action = action;
}
static gboolean
-find_inhibitor (GsmLogoutInhibitDialog *dialog,
+find_inhibitor (GsmInhibitDialog *dialog,
guint cookie,
GtkTreeIter *iter)
{
GtkTreeModel *model;
gboolean found_item;
- g_assert (GSM_IS_LOGOUT_INHIBIT_DIALOG (dialog));
+ g_assert (GSM_IS_INHIBIT_DIALOG (dialog));
found_item = FALSE;
model = GTK_TREE_MODEL (dialog->priv->list_store);
@@ -246,7 +246,7 @@
}
static void
-add_inhibitor (GsmLogoutInhibitDialog *dialog,
+add_inhibitor (GsmInhibitDialog *dialog,
GsmInhibitor *inhibitor)
{
const char *name;
@@ -326,7 +326,7 @@
}
static void
-update_dialog_text (GsmLogoutInhibitDialog *dialog)
+update_dialog_text (GsmInhibitDialog *dialog)
{
const char *description_text;
GtkWidget *widget;
@@ -348,12 +348,12 @@
static void
on_store_inhibitor_added (GsmInhibitorStore *store,
guint cookie,
- GsmLogoutInhibitDialog *dialog)
+ GsmInhibitDialog *dialog)
{
GsmInhibitor *inhibitor;
GtkTreeIter iter;
- g_debug ("GsmLogoutInhibitDialog: inhibitor added: %u", cookie);
+ g_debug ("GsmInhibitDialog: inhibitor added: %u", cookie);
inhibitor = gsm_inhibitor_store_lookup (store, cookie);
@@ -368,11 +368,11 @@
static void
on_store_inhibitor_removed (GsmInhibitorStore *store,
guint cookie,
- GsmLogoutInhibitDialog *dialog)
+ GsmInhibitDialog *dialog)
{
GtkTreeIter iter;
- g_debug ("GsmLogoutInhibitDialog: inhibitor removed: %u", cookie);
+ g_debug ("GsmInhibitDialog: inhibitor removed: %u", cookie);
/* Remove from model */
if (find_inhibitor (dialog, cookie, &iter)) {
@@ -387,10 +387,10 @@
}
static void
-gsm_logout_inhibit_dialog_set_inhibitor_store (GsmLogoutInhibitDialog *dialog,
+gsm_inhibit_dialog_set_inhibitor_store (GsmInhibitDialog *dialog,
GsmInhibitorStore *store)
{
- g_return_if_fail (GSM_IS_LOGOUT_INHIBIT_DIALOG (dialog));
+ g_return_if_fail (GSM_IS_INHIBIT_DIALOG (dialog));
if (store != NULL) {
g_object_ref (store);
@@ -408,7 +408,7 @@
}
- g_debug ("GsmLogoutInhibitDialog: setting store %p", store);
+ g_debug ("GsmInhibitDialog: setting store %p", store);
dialog->priv->inhibitors = store;
@@ -425,19 +425,19 @@
}
static void
-gsm_logout_inhibit_dialog_set_property (GObject *object,
+gsm_inhibit_dialog_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
- GsmLogoutInhibitDialog *dialog = GSM_LOGOUT_INHIBIT_DIALOG (object);
+ GsmInhibitDialog *dialog = GSM_INHIBIT_DIALOG (object);
switch (prop_id) {
case PROP_ACTION:
- gsm_logout_inhibit_dialog_set_action (dialog, g_value_get_int (value));
+ gsm_inhibit_dialog_set_action (dialog, g_value_get_int (value));
break;
case PROP_INHIBITOR_STORE:
- gsm_logout_inhibit_dialog_set_inhibitor_store (dialog, g_value_get_object (value));
+ gsm_inhibit_dialog_set_inhibitor_store (dialog, g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -446,12 +446,12 @@
}
static void
-gsm_logout_inhibit_dialog_get_property (GObject *object,
+gsm_inhibit_dialog_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- GsmLogoutInhibitDialog *dialog = GSM_LOGOUT_INHIBIT_DIALOG (object);
+ GsmInhibitDialog *dialog = GSM_INHIBIT_DIALOG (object);
switch (prop_id) {
case PROP_ACTION:
@@ -471,7 +471,7 @@
GtkCellRenderer *cell,
GtkTreeModel *model,
GtkTreeIter *iter,
- GsmLogoutInhibitDialog *dialog)
+ GsmInhibitDialog *dialog)
{
char *name;
char *reason;
@@ -500,14 +500,14 @@
static gboolean
add_to_model (guint cookie,
GsmInhibitor *inhibitor,
- GsmLogoutInhibitDialog *dialog)
+ GsmInhibitDialog *dialog)
{
add_inhibitor (dialog, inhibitor);
return FALSE;
}
static void
-populate_model (GsmLogoutInhibitDialog *dialog)
+populate_model (GsmInhibitDialog *dialog)
{
gsm_inhibitor_store_foreach_remove (dialog->priv->inhibitors,
(GsmInhibitorStoreFunc)add_to_model,
@@ -516,7 +516,7 @@
}
static void
-setup_dialog (GsmLogoutInhibitDialog *dialog)
+setup_dialog (GsmInhibitDialog *dialog)
{
const char *button_text;
GtkWidget *treeview;
@@ -606,13 +606,13 @@
}
static GObject *
-gsm_logout_inhibit_dialog_constructor (GType type,
+gsm_inhibit_dialog_constructor (GType type,
guint n_construct_properties,
GObjectConstructParam *construct_properties)
{
- GsmLogoutInhibitDialog *dialog;
+ GsmInhibitDialog *dialog;
- dialog = GSM_LOGOUT_INHIBIT_DIALOG (G_OBJECT_CLASS (gsm_logout_inhibit_dialog_parent_class)->constructor (type,
+ dialog = GSM_INHIBIT_DIALOG (G_OBJECT_CLASS (gsm_inhibit_dialog_parent_class)->constructor (type,
n_construct_properties,
construct_properties));
@@ -623,21 +623,21 @@
}
static void
-gsm_logout_inhibit_dialog_dispose (GObject *object)
+gsm_inhibit_dialog_dispose (GObject *object)
{
- G_OBJECT_CLASS (gsm_logout_inhibit_dialog_parent_class)->dispose (object);
+ G_OBJECT_CLASS (gsm_inhibit_dialog_parent_class)->dispose (object);
}
static void
-gsm_logout_inhibit_dialog_class_init (GsmLogoutInhibitDialogClass *klass)
+gsm_inhibit_dialog_class_init (GsmInhibitDialogClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->get_property = gsm_logout_inhibit_dialog_get_property;
- object_class->set_property = gsm_logout_inhibit_dialog_set_property;
- object_class->constructor = gsm_logout_inhibit_dialog_constructor;
- object_class->dispose = gsm_logout_inhibit_dialog_dispose;
- object_class->finalize = gsm_logout_inhibit_dialog_finalize;
+ object_class->get_property = gsm_inhibit_dialog_get_property;
+ object_class->set_property = gsm_inhibit_dialog_set_property;
+ object_class->constructor = gsm_inhibit_dialog_constructor;
+ object_class->dispose = gsm_inhibit_dialog_dispose;
+ object_class->finalize = gsm_inhibit_dialog_finalize;
g_object_class_install_property (object_class,
PROP_ACTION,
@@ -656,15 +656,15 @@
GSM_TYPE_INHIBITOR_STORE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
- g_type_class_add_private (klass, sizeof (GsmLogoutInhibitDialogPrivate));
+ g_type_class_add_private (klass, sizeof (GsmInhibitDialogPrivate));
}
static void
-gsm_logout_inhibit_dialog_init (GsmLogoutInhibitDialog *dialog)
+gsm_inhibit_dialog_init (GsmInhibitDialog *dialog)
{
GtkWidget *widget;
- dialog->priv = GSM_LOGOUT_INHIBIT_DIALOG_GET_PRIVATE (dialog);
+ dialog->priv = GSM_INHIBIT_DIALOG_GET_PRIVATE (dialog);
dialog->priv->xml = glade_xml_new (GLADEDIR "/" GLADE_XML_FILE,
"main-box",
@@ -686,18 +686,18 @@
}
static void
-gsm_logout_inhibit_dialog_finalize (GObject *object)
+gsm_inhibit_dialog_finalize (GObject *object)
{
- GsmLogoutInhibitDialog *dialog;
+ GsmInhibitDialog *dialog;
g_return_if_fail (object != NULL);
- g_return_if_fail (GSM_IS_LOGOUT_INHIBIT_DIALOG (object));
+ g_return_if_fail (GSM_IS_INHIBIT_DIALOG (object));
- dialog = GSM_LOGOUT_INHIBIT_DIALOG (object);
+ dialog = GSM_INHIBIT_DIALOG (object);
g_return_if_fail (dialog->priv != NULL);
- g_debug ("GsmLogoutInhibitDialog: finalizing");
+ g_debug ("GsmInhibitDialog: finalizing");
g_signal_handlers_disconnect_by_func (dialog->priv->inhibitors,
on_store_inhibitor_added,
@@ -709,16 +709,16 @@
g_object_unref (dialog->priv->inhibitors);
}
- G_OBJECT_CLASS (gsm_logout_inhibit_dialog_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gsm_inhibit_dialog_parent_class)->finalize (object);
}
GtkWidget *
-gsm_logout_inhibit_dialog_new (GsmInhibitorStore *inhibitors,
+gsm_inhibit_dialog_new (GsmInhibitorStore *inhibitors,
int action)
{
GObject *object;
- object = g_object_new (GSM_TYPE_LOGOUT_INHIBIT_DIALOG,
+ object = g_object_new (GSM_TYPE_INHIBIT_DIALOG,
"action", action,
"inhibitor-store", inhibitors,
NULL);
Copied: branches/dbus_based/gnome-session/gsm-inhibit-dialog.h (from r4801, /branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.h)
==============================================================================
--- /branches/dbus_based/gnome-session/gsm-logout-inhibit-dialog.h (original)
+++ branches/dbus_based/gnome-session/gsm-inhibit-dialog.h Tue Jul 15 19:22:40 2008
@@ -18,8 +18,8 @@
*
*/
-#ifndef __GSM_LOGOUT_INHIBIT_DIALOG_H
-#define __GSM_LOGOUT_INHIBIT_DIALOG_H
+#ifndef __GSM_INHIBIT_DIALOG_H
+#define __GSM_INHIBIT_DIALOG_H
#include <glib-object.h>
#include <gtk/gtkdialog.h>
@@ -28,14 +28,14 @@
G_BEGIN_DECLS
-#define GSM_TYPE_LOGOUT_INHIBIT_DIALOG (gsm_logout_inhibit_dialog_get_type ())
-#define GSM_LOGOUT_INHIBIT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_LOGOUT_INHIBIT_DIALOG, GsmLogoutInhibitDialog))
-#define GSM_LOGOUT_INHIBIT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_LOGOUT_INHIBIT_DIALOG, GsmLogoutInhibitDialogClass))
-#define GSM_IS_LOGOUT_INHIBIT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_LOGOUT_INHIBIT_DIALOG))
-#define GSM_IS_LOGOUT_INHIBIT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_LOGOUT_INHIBIT_DIALOG))
-#define GSM_LOGOUT_INHIBIT_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_LOGOUT_INHIBIT_DIALOG, GsmLogoutInhibitDialogClass))
+#define GSM_TYPE_INHIBIT_DIALOG (gsm_inhibit_dialog_get_type ())
+#define GSM_INHIBIT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialog))
+#define GSM_INHIBIT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialogClass))
+#define GSM_IS_INHIBIT_DIALOG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSM_TYPE_INHIBIT_DIALOG))
+#define GSM_IS_INHIBIT_DIALOG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSM_TYPE_INHIBIT_DIALOG))
+#define GSM_INHIBIT_DIALOG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSM_TYPE_INHIBIT_DIALOG, GsmInhibitDialogClass))
-typedef struct GsmLogoutInhibitDialogPrivate GsmLogoutInhibitDialogPrivate;
+typedef struct GsmInhibitDialogPrivate GsmInhibitDialogPrivate;
typedef enum
{
@@ -49,21 +49,21 @@
typedef struct
{
- GtkDialog parent;
- GsmLogoutInhibitDialogPrivate *priv;
-} GsmLogoutInhibitDialog;
+ GtkDialog parent;
+ GsmInhibitDialogPrivate *priv;
+} GsmInhibitDialog;
typedef struct
{
GtkDialogClass parent_class;
-} GsmLogoutInhibitDialogClass;
+} GsmInhibitDialogClass;
-GType gsm_logout_inhibit_dialog_get_type (void);
+GType gsm_inhibit_dialog_get_type (void);
-GtkWidget * gsm_logout_inhibit_dialog_new (GsmInhibitorStore *inhibitors,
- int action);
-GtkTreeModel * gsm_logout_inhibit_dialog_get_model (GsmLogoutInhibitDialog *dialog);
+GtkWidget * gsm_inhibit_dialog_new (GsmInhibitorStore *inhibitors,
+ int action);
+GtkTreeModel * gsm_inhibit_dialog_get_model (GsmInhibitDialog *dialog);
G_END_DECLS
-#endif /* __GSM_LOGOUT_INHIBIT_DIALOG_H */
+#endif /* __GSM_INHIBIT_DIALOG_H */
Modified: branches/dbus_based/gnome-session/gsm-manager.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-manager.c (original)
+++ branches/dbus_based/gnome-session/gsm-manager.c Tue Jul 15 19:22:40 2008
@@ -57,7 +57,7 @@
#include "util.h"
#include "gdm.h"
#include "gsm-logout-dialog.h"
-#include "gsm-logout-inhibit-dialog.h"
+#include "gsm-inhibit-dialog.h"
#include "gsm-consolekit.h"
#include "gsm-power-manager.h"
@@ -1570,13 +1570,13 @@
}
static void
-logout_inhibit_dialog_response (GsmLogoutInhibitDialog *dialog,
- guint response_id,
- GsmManager *manager)
+inhibit_dialog_response (GsmInhibitDialog *dialog,
+ guint response_id,
+ GsmManager *manager)
{
int action;
- g_debug ("GsmManager: Logout inhibit dialog response: %d", response_id);
+ g_debug ("GsmManager: Inhibit dialog response: %d", response_id);
/* In case of dialog cancel, switch user, hibernate and
* suspend, we just perform the respective action and return,
@@ -1617,12 +1617,12 @@
return;
}
- manager->priv->inhibit_dialog = gsm_logout_inhibit_dialog_new (manager->priv->inhibitors,
- GSM_LOGOUT_ACTION_REBOOT);
+ manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors,
+ GSM_LOGOUT_ACTION_REBOOT);
g_signal_connect (manager->priv->inhibit_dialog,
"response",
- G_CALLBACK (logout_inhibit_dialog_response),
+ G_CALLBACK (inhibit_dialog_response),
manager);
gtk_widget_show (manager->priv->inhibit_dialog);
}
@@ -1644,12 +1644,12 @@
return;
}
- manager->priv->inhibit_dialog = gsm_logout_inhibit_dialog_new (manager->priv->inhibitors,
+ manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors,
GSM_LOGOUT_ACTION_SHUTDOWN);
g_signal_connect (manager->priv->inhibit_dialog,
"response",
- G_CALLBACK (logout_inhibit_dialog_response),
+ G_CALLBACK (inhibit_dialog_response),
manager);
gtk_widget_show (manager->priv->inhibit_dialog);
}
@@ -1670,12 +1670,12 @@
return;
}
- manager->priv->inhibit_dialog = gsm_logout_inhibit_dialog_new (manager->priv->inhibitors,
+ manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors,
GSM_LOGOUT_ACTION_SLEEP);
g_signal_connect (manager->priv->inhibit_dialog,
"response",
- G_CALLBACK (logout_inhibit_dialog_response),
+ G_CALLBACK (inhibit_dialog_response),
manager);
gtk_widget_show (manager->priv->inhibit_dialog);
}
@@ -1697,12 +1697,12 @@
return;
}
- manager->priv->inhibit_dialog = gsm_logout_inhibit_dialog_new (manager->priv->inhibitors,
+ manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors,
GSM_LOGOUT_ACTION_HIBERNATE);
g_signal_connect (manager->priv->inhibit_dialog,
"response",
- G_CALLBACK (logout_inhibit_dialog_response),
+ G_CALLBACK (inhibit_dialog_response),
manager);
gtk_widget_show (manager->priv->inhibit_dialog);
}
@@ -1723,12 +1723,12 @@
return;
}
- manager->priv->inhibit_dialog = gsm_logout_inhibit_dialog_new (manager->priv->inhibitors,
- GSM_LOGOUT_ACTION_LOGOUT);
+ manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors,
+ GSM_LOGOUT_ACTION_LOGOUT);
g_signal_connect (manager->priv->inhibit_dialog,
"response",
- G_CALLBACK (logout_inhibit_dialog_response),
+ G_CALLBACK (inhibit_dialog_response),
manager);
gtk_widget_show (manager->priv->inhibit_dialog);
}
@@ -1749,12 +1749,12 @@
return;
}
- manager->priv->inhibit_dialog = gsm_logout_inhibit_dialog_new (manager->priv->inhibitors,
- GSM_LOGOUT_ACTION_SWITCH_USER);
+ manager->priv->inhibit_dialog = gsm_inhibit_dialog_new (manager->priv->inhibitors,
+ GSM_LOGOUT_ACTION_SWITCH_USER);
g_signal_connect (manager->priv->inhibit_dialog,
"response",
- G_CALLBACK (logout_inhibit_dialog_response),
+ G_CALLBACK (inhibit_dialog_response),
manager);
gtk_widget_show (manager->priv->inhibit_dialog);
}
Modified: branches/dbus_based/gnome-session/test-client-dbus.c
==============================================================================
--- branches/dbus_based/gnome-session/test-client-dbus.c (original)
+++ branches/dbus_based/gnome-session/test-client-dbus.c Tue Jul 15 19:22:40 2008
@@ -70,7 +70,7 @@
const char *app_id;
startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
- app_id = "test-client-method";
+ app_id = "test-client-dbus";
error = NULL;
res = dbus_g_proxy_call (sm_proxy,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
