Remove spurious const.

Sat Mar  3 13:32:47 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
	const.

	* gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.

	* gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
	is no focus widget for the dialog currently, grab the focus as well
	as the default.

	* gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
	the action area's children to iterate through, not the
	dialog's children.

diff --git a/ChangeLog b/ChangeLog
index dae1f026b0961405448b66b04d6699629aa74084..1e0221640c4e7b88fabd11b40ab46e78a600e9ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Sat Mar  3 13:32:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
+       const.
+
+       * gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
+       is no focus widget for the dialog currently, grab the focus as well
+       as the default.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
+       the action area's children to iterate through, not the
+       dialog's children.
+
 Sat Mar  3 13:21:27 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/Makefile.am tests/testsocket.c tests/testsocket_child.c:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index dae1f026b0961405448b66b04d6699629aa74084..1e0221640c4e7b88fabd11b40ab46e78a600e9ca 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,18 @@
+Sat Mar  3 13:32:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
+       const.
+
+       * gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
+       is no focus widget for the dialog currently, grab the focus as well
+       as the default.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
+       the action area's children to iterate through, not the
+       dialog's children.
+
 Sat Mar  3 13:21:27 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/Makefile.am tests/testsocket.c tests/testsocket_child.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index dae1f026b0961405448b66b04d6699629aa74084..1e0221640c4e7b88fabd11b40ab46e78a600e9ca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,18 @@
+Sat Mar  3 13:32:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
+       const.
+
+       * gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
+       is no focus widget for the dialog currently, grab the focus as well
+       as the default.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
+       the action area's children to iterate through, not the
+       dialog's children.
+
 Sat Mar  3 13:21:27 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/Makefile.am tests/testsocket.c tests/testsocket_child.c:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index dae1f026b0961405448b66b04d6699629aa74084..1e0221640c4e7b88fabd11b40ab46e78a600e9ca 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,18 @@
+Sat Mar  3 13:32:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
+       const.
+
+       * gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
+       is no focus widget for the dialog currently, grab the focus as well
+       as the default.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
+       the action area's children to iterate through, not the
+       dialog's children.
+
 Sat Mar  3 13:21:27 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/Makefile.am tests/testsocket.c tests/testsocket_child.c:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index dae1f026b0961405448b66b04d6699629aa74084..1e0221640c4e7b88fabd11b40ab46e78a600e9ca 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,18 @@
+Sat Mar  3 13:32:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
+       const.
+
+       * gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
+       is no focus widget for the dialog currently, grab the focus as well
+       as the default.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
+       the action area's children to iterate through, not the
+       dialog's children.
+
 Sat Mar  3 13:21:27 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/Makefile.am tests/testsocket.c tests/testsocket_child.c:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index dae1f026b0961405448b66b04d6699629aa74084..1e0221640c4e7b88fabd11b40ab46e78a600e9ca 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,18 @@
+Sat Mar  3 13:32:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
+       const.
+
+       * gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
+       is no focus widget for the dialog currently, grab the focus as well
+       as the default.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
+       the action area's children to iterate through, not the
+       dialog's children.
+
 Sat Mar  3 13:21:27 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/Makefile.am tests/testsocket.c tests/testsocket_child.c:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index dae1f026b0961405448b66b04d6699629aa74084..1e0221640c4e7b88fabd11b40ab46e78a600e9ca 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,18 @@
+Sat Mar  3 13:32:47 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimmodule.c (gtk_im_module_init): Remove spurious
+       const.
+
+       * gdk-pixbuf-2.0.pc.in gtk+-2.0.pc.in: Fix include path.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): If there
+       is no focus widget for the dialog currently, grab the focus as well
+       as the default.
+
+       * gtk/gtkdialog.c (gtk_dialog_set_default_response): Get
+       the action area's children to iterate through, not the
+       dialog's children.
+
 Sat Mar  3 13:21:27 2001  Owen Taylor  <otaylor@redhat.com>
 
        * tests/Makefile.am tests/testsocket.c tests/testsocket_child.c:

diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in
index 96afc3d31b71a7a32cb6c4acb229afed986e7baf..bc22fd3d1fcc279c56359f98c6d1c95eb83f601e 100644 (file)
--- a/gdk-pixbuf-2.0.pc.in
+++ b/gdk-pixbuf-2.0.pc.in
@@ -8,4 +8,4 @@ Description: Image loading and scaling
 Version: @VERSION@
 Requires: gobject-2.0,gmodule-2.0
 Libs: -L${libdir} -lgdk_pixbuf-1.3 @INTLLIBS@ @MATH_LIB@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/gtk-2.0.

diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in
index e052d884f979ae0ff038849a513b89c523e19d77..baab69a33a24a1c096ada88c08f8cda7ac276105 100644 (file)
--- a/gtk+-2.0.pc.in
+++ b/gtk+-2.0.pc.in
@@ -9,4 +9,4 @@ Description: GIMP Tool Kit (${target} target)
 Version: @VERSION@
 Requires: gdk-${target}-2.0
 Libs: -L${libdir} -lgtk-${target}-1.3
-Cflags: -I${includedir}
+Cflags: -I${includedir}/gtk-2.0

diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 0f13d57a4e8fe82a860db8aaf2b5185e75a55e9c..cdacccaf490469be1006adc719aa2f05374489c1 100644 (file)
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -511,7 +511,7 @@ gtk_dialog_set_default_response (GtkDialog *dialog,
   GList *children;
   GList *tmp_list;
 
-  children = gtk_container_children (GTK_CONTAINER (dialog));
+  children = gtk_container_children (GTK_CONTAINER (dialog->action_area));
 
   tmp_list = children;
   while (tmp_list != NULL)
@@ -521,8 +521,13 @@ gtk_dialog_set_default_response (GtkDialog *dialog,
                                             "gtk-dialog-response-data");
 
       if (rd && rd->response_id == response_id)
-        gtk_widget_grab_default (widget);
-
+       {
+         gtk_widget_grab_default (widget);
+         
+         if (!GTK_WINDOW (dialog)->focus_widget)
+           gtk_widget_grab_focus (widget);
+       }
+           
       tmp_list = g_list_next (tmp_list);
     }
 

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 017f7ecfb0e3e79b18bc3c4ae0bead71ddb05850..7d882a293ecad45bad2c8cdc5314df85e8247262 100644 (file)
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -227,7 +227,7 @@ gtk_im_module_init ()
 {
   GString *line_buf = g_string_new (NULL);
   GString *tmp_buf = g_string_new (NULL);
-  const gchar *filename = gtk_rc_get_im_module_file();
+  gchar *filename = gtk_rc_get_im_module_file();
   FILE *file;
   gboolean have_error = FALSE;