Handle the case where bin->child is NULL. (#70153, Padraig O'Briain)

Thu Jan 31 10:21:05 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkplug.c (gtk_plug_focus): Handle the case where
        bin->child is NULL. (#70153, Padraig O'Briain)

        * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems):
        Actually call gettext() on the labels; previously they
        were marked with N_() but we never called gettext().

diff --git a/ChangeLog b/ChangeLog
index 92252cad136ba05a935ba59f29736323726c854c..99d0dbcb15b782cf144fa6d420c83b0ef810b4ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Jan 31 10:21:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkplug.c (gtk_plug_focus): Handle the case where
+       bin->child is NULL. (#70153, Padraig O'Briain)
+
+       * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): 
+       Actually call gettext() on the labels; previously they
+       were marked with N_() but we never called gettext().
+
 Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 92252cad136ba05a935ba59f29736323726c854c..99d0dbcb15b782cf144fa6d420c83b0ef810b4ef 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Thu Jan 31 10:21:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkplug.c (gtk_plug_focus): Handle the case where
+       bin->child is NULL. (#70153, Padraig O'Briain)
+
+       * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): 
+       Actually call gettext() on the labels; previously they
+       were marked with N_() but we never called gettext().
+
 Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 92252cad136ba05a935ba59f29736323726c854c..99d0dbcb15b782cf144fa6d420c83b0ef810b4ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Thu Jan 31 10:21:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkplug.c (gtk_plug_focus): Handle the case where
+       bin->child is NULL. (#70153, Padraig O'Briain)
+
+       * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): 
+       Actually call gettext() on the labels; previously they
+       were marked with N_() but we never called gettext().
+
 Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 92252cad136ba05a935ba59f29736323726c854c..99d0dbcb15b782cf144fa6d420c83b0ef810b4ef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Thu Jan 31 10:21:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkplug.c (gtk_plug_focus): Handle the case where
+       bin->child is NULL. (#70153, Padraig O'Briain)
+
+       * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): 
+       Actually call gettext() on the labels; previously they
+       were marked with N_() but we never called gettext().
+
 Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 92252cad136ba05a935ba59f29736323726c854c..99d0dbcb15b782cf144fa6d420c83b0ef810b4ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Thu Jan 31 10:21:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkplug.c (gtk_plug_focus): Handle the case where
+       bin->child is NULL. (#70153, Padraig O'Briain)
+
+       * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): 
+       Actually call gettext() on the labels; previously they
+       were marked with N_() but we never called gettext().
+
 Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 92252cad136ba05a935ba59f29736323726c854c..99d0dbcb15b782cf144fa6d420c83b0ef810b4ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Thu Jan 31 10:21:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkplug.c (gtk_plug_focus): Handle the case where
+       bin->child is NULL. (#70153, Padraig O'Briain)
+
+       * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): 
+       Actually call gettext() on the labels; previously they
+       were marked with N_() but we never called gettext().
+
 Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 92252cad136ba05a935ba59f29736323726c854c..99d0dbcb15b782cf144fa6d420c83b0ef810b4ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Thu Jan 31 10:21:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkplug.c (gtk_plug_focus): Handle the case where
+       bin->child is NULL. (#70153, Padraig O'Briain)
+
+       * gtk/gtktextutil.c (_gtk_text_util_append_special_char_menuitems): 
+       Actually call gettext() on the labels; previously they
+       were marked with N_() but we never called gettext().
+
 Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index aff46e861b86cd24cb05d31a06e88eb7c1678233..eb4f10c228ae35adedce92a04a1fd21cf082f016 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -841,7 +841,7 @@ gtk_plug_focus (GtkWidget        *widget,
     {
       /* Try to focus the first widget in the window */
       
-      if (gtk_widget_child_focus (bin->child, direction))
+      if (bin->child && gtk_widget_child_focus (bin->child, direction))
         return TRUE;
     }
 

diff --git a/gtk/gtktextutil.c b/gtk/gtktextutil.c
index 7a53fab676401c1b097ba93e0dfe49c80529fc20..f6265e670369d683eb3efc8ba44fe74ff55632a6 100644 (file)
--- a/gtk/gtktextutil.c
+++ b/gtk/gtktextutil.c
@@ -102,7 +102,7 @@ _gtk_text_util_append_special_char_menuitems (GtkMenuShell              *menushe
       info->func = func;
       info->data = data;
       
-      menuitem = gtk_menu_item_new_with_mnemonic (bidi_menu_entries[i].label);
+      menuitem = gtk_menu_item_new_with_mnemonic (_(bidi_menu_entries[i].label));
       g_object_set_data (G_OBJECT (menuitem), "gtk-unicode-menu-entry",
                          &bidi_menu_entries[i]);