[gnome-keyring] Compile with -DGSEAL_ENABLE. Fixes bug 612475.
- From: Andre Klapper <aklapper src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keyring] Compile with -DGSEAL_ENABLE. Fixes bug 612475.
- Date: Tue, 13 Apr 2010 12:29:02 +0000 (UTC)
commit b0291cd3bd011ef97cb484345d7a7dc82738bac5
Author: Andre Klapper <a9016009 gmx de>
Date: Tue Apr 13 14:28:40 2010 +0200
Compile with -DGSEAL_ENABLE. Fixes bug 612475.
daemon/prompt/gkd-prompt-tool.c | 4 ++--
gcr/gcr-import-dialog.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/daemon/prompt/gkd-prompt-tool.c b/daemon/prompt/gkd-prompt-tool.c
index 024ae88..0729067 100644
--- a/daemon/prompt/gkd-prompt-tool.c
+++ b/daemon/prompt/gkd-prompt-tool.c
@@ -72,7 +72,7 @@ grab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
{
GdkGrabStatus status;
if (!keyboard_grabbed && GRAB_KEYBOARD) {
- status = gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event));
+ status = gdk_keyboard_grab (gtk_widget_get_window (win), FALSE, gdk_event_get_time (event));
if (status == GDK_GRAB_SUCCESS) {
keyboard_grabbed = TRUE;
} else {
@@ -94,7 +94,7 @@ ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
static gboolean
window_state_changed (GtkWidget *win, GdkEventWindowState *event, gpointer data)
{
- GdkWindowState state = gdk_window_get_state (win->window);
+ GdkWindowState state = gdk_window_get_state (gtk_widget_get_window (win));
if (state & GDK_WINDOW_STATE_WITHDRAWN ||
state & GDK_WINDOW_STATE_ICONIFIED ||
diff --git a/gcr/gcr-import-dialog.c b/gcr/gcr-import-dialog.c
index a584046..ae90abc 100644
--- a/gcr/gcr-import-dialog.c
+++ b/gcr/gcr-import-dialog.c
@@ -131,7 +131,7 @@ gcr_import_dialog_constructor (GType type, guint n_props, GObjectConstructParam
/* Fill in the dialog from builder */
widget = GTK_WIDGET (gtk_builder_get_object (self->pv->builder, "import-dialog"));
g_return_val_if_fail (widget, FALSE);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), widget);
+ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self))), widget);
/* Add a secure entry */
buffer = egg_entry_buffer_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]