aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc/e-gui-utils.c
diff options
context:
space:
mode:
authorMike Kestner <mkestner@src.gnome.org>2002-11-01 05:30:57 +0800
committerMike Kestner <mkestner@src.gnome.org>2002-11-01 05:30:57 +0800
commit613453b1095e325149b8d37e5731d415e1d5f9bd (patch)
tree1c0d7f9be4d4a87aa67d8e185ae2bb23d02254b7 /widgets/misc/e-gui-utils.c
parentec242d6c30d7bf056c8f59710b8576c942f93583 (diff)
downloadgsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar
gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.gz
gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.bz2
gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.lz
gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.xz
gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.tar.zst
gsoc2013-evolution-613453b1095e325149b8d37e5731d415e1d5f9bd.zip
merging the gal-2 branch back to the trunk.
merging the gal-2 branch back to the trunk. svn path=/trunk/; revision=18471
Diffstat (limited to 'widgets/misc/e-gui-utils.c')
-rw-r--r--widgets/misc/e-gui-utils.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index d70bb829a6..2e486cc312 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -1,5 +1,5 @@
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
+/*
* e-gui-utils.c
* Copyright 2000, 2001, Ximian, Inc.
*
@@ -28,9 +28,8 @@
#include <gtk/gtkentry.h>
#include <gtk/gtksignal.h>
#include <libgnomeui/gnome-messagebox.h>
-#include <libgnomeui/gnome-stock.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+#include <libgnomecanvas/gnome-canvas-pixbuf.h>
void
e_notice (GtkWindow *window, const char *type, const char *format, ...)
@@ -41,7 +40,7 @@ e_notice (GtkWindow *window, const char *type, const char *format, ...)
va_start (args, format);
str = g_strdup_vprintf (format, args);
- dialog = gnome_message_box_new (str, type, GNOME_STOCK_BUTTON_OK, NULL);
+ dialog = gnome_message_box_new (str, type, GTK_STOCK_OK, NULL);
va_end (args);
g_free (str);
@@ -162,22 +161,24 @@ e_container_change_tab_order_callback(GtkContainer *container,
if (GTK_WIDGET_DRAWABLE (child) &&
GTK_IS_CONTAINER (child) &&
!GTK_WIDGET_HAS_FOCUS (child))
- if (gtk_container_focus (GTK_CONTAINER (child), direction)) {
- gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
+ if (gtk_widget_child_focus (GTK_WIDGET (child), direction)) {
+ gtk_signal_emit_stop_by_name (
+ GTK_OBJECT (container), "focus");
return TRUE;
}
}
}
else if (GTK_WIDGET_DRAWABLE (child)) {
if (GTK_IS_CONTAINER (child)) {
- if (gtk_container_focus (GTK_CONTAINER (child), direction)) {
- gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
+ if (gtk_widget_child_focus (GTK_WIDGET (child), direction)) {
+ gtk_signal_emit_stop_by_name (
+ GTK_OBJECT (container), "focus");
return TRUE;
}
}
else if (GTK_WIDGET_CAN_FOCUS (child)) {
gtk_widget_grab_focus (child);
- gtk_signal_emit_stop_by_name(GTK_OBJECT(container), "focus");
+ gtk_signal_emit_stop_by_name (GTK_OBJECT (container), "focus");
return TRUE;
}
}