Register all stock icons "unscaled" so that we don't have icons only

Wed Feb 27 12:34:21 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkiconfactory.c: Register all stock icons
	"unscaled" so that we don't have icons only available
	at some sizes. (#68896)

Wed Feb 27 11:59:05 2002  Owen Taylor  <otaylor@redhat.com>

	Some ASCII vs. locale fixes from Darin Adler (#55837)

	* gtk/gtkcombo.c (gtk_combo_find): Implement real
	case-insensitive comparison using g_utf8_casefold().

	* gtk/gtkaccellabel.c (gtk_accel_label_refetch): Fix
	assignment of gunichar to char by replacing g_unichar_totitle
	with g_ascii_toupper ... the contents would only be ascii
	here anyways.

	* gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale)
	* gtk/gtkfontsel.c (gtk_font_selection_show_available_fonts):
	Replace a calls to g_strcasecmp() with g_ascii_strcasecmp().

diff --git a/ChangeLog b/ChangeLog
index 6d2ed51fe70fa0a9279f799acbbec8b9001d441e..433ab7b5d46c3f448f08e869e1a49dabffd75319 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Wed Feb 27 12:34:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c: Register all stock icons
+       "unscaled" so that we don't have icons only available
+       at some sizes. (#68896)
+
+Wed Feb 27 11:59:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Some ASCII vs. locale fixes from Darin Adler (#55837)
+
+       * gtk/gtkcombo.c (gtk_combo_find): Implement real
+       case-insensitive comparison using g_utf8_casefold().
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Fix
+       assignment of gunichar to char by replacing g_unichar_totitle
+       with g_ascii_toupper ... the contents would only be ascii
+       here anyways.
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale) 
+       * gtk/gtkfontsel.c (gtk_font_selection_show_available_fonts): 
+       Replace a calls to g_strcasecmp() with g_ascii_strcasecmp().
+
 2002-02-27  Hans Breuer  <hans@breuer.org>
 
        * demos/gtk-demo/makefile.msc.in : new file

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6d2ed51fe70fa0a9279f799acbbec8b9001d441e..433ab7b5d46c3f448f08e869e1a49dabffd75319 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,25 @@
+Wed Feb 27 12:34:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c: Register all stock icons
+       "unscaled" so that we don't have icons only available
+       at some sizes. (#68896)
+
+Wed Feb 27 11:59:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Some ASCII vs. locale fixes from Darin Adler (#55837)
+
+       * gtk/gtkcombo.c (gtk_combo_find): Implement real
+       case-insensitive comparison using g_utf8_casefold().
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Fix
+       assignment of gunichar to char by replacing g_unichar_totitle
+       with g_ascii_toupper ... the contents would only be ascii
+       here anyways.
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale) 
+       * gtk/gtkfontsel.c (gtk_font_selection_show_available_fonts): 
+       Replace a calls to g_strcasecmp() with g_ascii_strcasecmp().
+
 2002-02-27  Hans Breuer  <hans@breuer.org>
 
        * demos/gtk-demo/makefile.msc.in : new file

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6d2ed51fe70fa0a9279f799acbbec8b9001d441e..433ab7b5d46c3f448f08e869e1a49dabffd75319 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,25 @@
+Wed Feb 27 12:34:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c: Register all stock icons
+       "unscaled" so that we don't have icons only available
+       at some sizes. (#68896)
+
+Wed Feb 27 11:59:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Some ASCII vs. locale fixes from Darin Adler (#55837)
+
+       * gtk/gtkcombo.c (gtk_combo_find): Implement real
+       case-insensitive comparison using g_utf8_casefold().
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Fix
+       assignment of gunichar to char by replacing g_unichar_totitle
+       with g_ascii_toupper ... the contents would only be ascii
+       here anyways.
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale) 
+       * gtk/gtkfontsel.c (gtk_font_selection_show_available_fonts): 
+       Replace a calls to g_strcasecmp() with g_ascii_strcasecmp().
+
 2002-02-27  Hans Breuer  <hans@breuer.org>
 
        * demos/gtk-demo/makefile.msc.in : new file

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6d2ed51fe70fa0a9279f799acbbec8b9001d441e..433ab7b5d46c3f448f08e869e1a49dabffd75319 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,25 @@
+Wed Feb 27 12:34:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c: Register all stock icons
+       "unscaled" so that we don't have icons only available
+       at some sizes. (#68896)
+
+Wed Feb 27 11:59:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Some ASCII vs. locale fixes from Darin Adler (#55837)
+
+       * gtk/gtkcombo.c (gtk_combo_find): Implement real
+       case-insensitive comparison using g_utf8_casefold().
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Fix
+       assignment of gunichar to char by replacing g_unichar_totitle
+       with g_ascii_toupper ... the contents would only be ascii
+       here anyways.
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale) 
+       * gtk/gtkfontsel.c (gtk_font_selection_show_available_fonts): 
+       Replace a calls to g_strcasecmp() with g_ascii_strcasecmp().
+
 2002-02-27  Hans Breuer  <hans@breuer.org>
 
        * demos/gtk-demo/makefile.msc.in : new file

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6d2ed51fe70fa0a9279f799acbbec8b9001d441e..433ab7b5d46c3f448f08e869e1a49dabffd75319 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,25 @@
+Wed Feb 27 12:34:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c: Register all stock icons
+       "unscaled" so that we don't have icons only available
+       at some sizes. (#68896)
+
+Wed Feb 27 11:59:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Some ASCII vs. locale fixes from Darin Adler (#55837)
+
+       * gtk/gtkcombo.c (gtk_combo_find): Implement real
+       case-insensitive comparison using g_utf8_casefold().
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Fix
+       assignment of gunichar to char by replacing g_unichar_totitle
+       with g_ascii_toupper ... the contents would only be ascii
+       here anyways.
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale) 
+       * gtk/gtkfontsel.c (gtk_font_selection_show_available_fonts): 
+       Replace a calls to g_strcasecmp() with g_ascii_strcasecmp().
+
 2002-02-27  Hans Breuer  <hans@breuer.org>
 
        * demos/gtk-demo/makefile.msc.in : new file

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6d2ed51fe70fa0a9279f799acbbec8b9001d441e..433ab7b5d46c3f448f08e869e1a49dabffd75319 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,25 @@
+Wed Feb 27 12:34:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c: Register all stock icons
+       "unscaled" so that we don't have icons only available
+       at some sizes. (#68896)
+
+Wed Feb 27 11:59:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Some ASCII vs. locale fixes from Darin Adler (#55837)
+
+       * gtk/gtkcombo.c (gtk_combo_find): Implement real
+       case-insensitive comparison using g_utf8_casefold().
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Fix
+       assignment of gunichar to char by replacing g_unichar_totitle
+       with g_ascii_toupper ... the contents would only be ascii
+       here anyways.
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale) 
+       * gtk/gtkfontsel.c (gtk_font_selection_show_available_fonts): 
+       Replace a calls to g_strcasecmp() with g_ascii_strcasecmp().
+
 2002-02-27  Hans Breuer  <hans@breuer.org>
 
        * demos/gtk-demo/makefile.msc.in : new file

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6d2ed51fe70fa0a9279f799acbbec8b9001d441e..433ab7b5d46c3f448f08e869e1a49dabffd75319 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,25 @@
+Wed Feb 27 12:34:21 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkiconfactory.c: Register all stock icons
+       "unscaled" so that we don't have icons only available
+       at some sizes. (#68896)
+
+Wed Feb 27 11:59:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+       Some ASCII vs. locale fixes from Darin Adler (#55837)
+
+       * gtk/gtkcombo.c (gtk_combo_find): Implement real
+       case-insensitive comparison using g_utf8_casefold().
+
+       * gtk/gtkaccellabel.c (gtk_accel_label_refetch): Fix
+       assignment of gunichar to char by replacing g_unichar_totitle
+       with g_ascii_toupper ... the contents would only be ascii
+       here anyways.
+
+       * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale) 
+       * gtk/gtkfontsel.c (gtk_font_selection_show_available_fonts): 
+       Replace a calls to g_strcasecmp() with g_ascii_strcasecmp().
+
 2002-02-27  Hans Breuer  <hans@breuer.org>
 
        * demos/gtk-demo/makefile.msc.in : new file

diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c
index 875e36241d0826760ff6e468480601e80066c4d9..4a8f421a16e854c31ec1dcdc56b0320cd520d7b0 100644 (file)
--- a/gdk/x11/gdkim-x11.c
+++ b/gdk/x11/gdkim-x11.c
@@ -84,7 +84,7 @@ _gdk_x11_initialize_locale (void)
          result == 0x765)
        {
          if ((strlen (current_locale) < 4) ||
-             g_strcasecmp (current_locale + strlen(current_locale) - 4, "utf8"))
+             g_ascii_strcasecmp (current_locale + strlen(current_locale) - 4, "utf8"))
            gdk_use_mb = FALSE;
        }
 #endif /* X_LOCALE */

diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index c5d1b87167d998f83cca7bc957e8c7be762d1b0b..0d3548d5596276cf93045ffe7f35024cd567002e 100644 (file)
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -542,7 +542,7 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
              
              tmp = gtk_accelerator_name (key->accel_key, 0);
              if (tmp[0] != 0 && tmp[1] == 0)
-               tmp[0] = g_unichar_totitle (tmp[0]);
+               tmp[0] = g_ascii_toupper (tmp[0]);
              g_string_append (gstring, tmp);
              g_free (tmp);
            }

diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index b36049ee9a481282954a9e6d04d0da39f9a2271b..9fcbf8f55a90d7de4684735d4e1587bfa0ff6684 100644 (file)
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -308,29 +308,41 @@ static GtkListItem *
 gtk_combo_find (GtkCombo * combo)
 {
   const gchar *text;
+  GtkListItem *found = NULL;
   gchar *ltext;
+  gchar *compare_text;
   GList *clist;
-  int (*string_compare) (const char *, const char *);
 
+  text = gtk_entry_get_text (GTK_ENTRY (combo->entry));
   if (combo->case_sensitive)
-    string_compare = strcmp;
+    compare_text = (gchar *)text;
   else
-    string_compare = g_strcasecmp;
-
-  text = gtk_entry_get_text (GTK_ENTRY (combo->entry));
+    compare_text = g_utf8_casefold (text, -1);
+  
   clist = GTK_LIST (combo->list)->children;
 
-  while (clist && clist->data)
+  while (!found && clist && clist->data)
     {
       ltext = gtk_combo_func (GTK_LIST_ITEM (clist->data));
       if (!ltext)
        continue;
-      if (!(*string_compare) (ltext, text))
-       return (GtkListItem *) clist->data;
+
+      if (!combo->case_sensitive)
+       ltext = g_utf8_casefold (ltext, -1);
+
+      if (strcmp (ltext, compare_text) == 0)
+       found = clist->data;
+
+      if (!combo->case_sensitive)
+       g_free (ltext);
+
       clist = clist->next;
     }
 
-  return NULL;
+  if (!combo->case_sensitive)
+    g_free (compare_text);
+
+  return found;
 }
 
 static gchar *

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index 8df9afff44993f5429e97fd7d46fd9afa807921f..43ec48654098539f6b2a0ee0a3fa2220b78fcdf1 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -635,7 +635,7 @@ gtk_font_selection_show_available_fonts (GtkFontSelection *fontsel)
                          FAMILY_NAME_COLUMN, name,
                          -1);
       
-      if (i == 0 || !g_strcasecmp (name, "sans"))
+      if (i == 0 || !g_ascii_strcasecmp (name, "sans"))
        {
          match_family = families[i];
          match_row = iter;

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 7d4bee46000c32b96584c8e112bf15792b24e7bd..306591de539852ea2c912b18a53bc3c1c1dd156c 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -318,6 +318,7 @@ gtk_icon_factory_lookup_default (const gchar *stock_id)
   return gtk_icon_factory_lookup (gtk_default_icons, stock_id);
 }
 
+#if 0
 static GtkIconSet *
 sized_icon_set_from_inline (const guchar *inline_data,
                             GtkIconSize   size)
@@ -341,7 +342,7 @@ sized_icon_set_from_inline (const guchar *inline_data,
   
   return set;
 }
-
+#endif
 
 static GtkIconSet *
 sized_with_fallback_icon_set_from_inline (const guchar *fallback_data,
@@ -400,6 +401,7 @@ unsized_icon_set_from_inline (const guchar *inline_data)
   return set;
 }
 
+#if 0
 static void
 add_sized (GtkIconFactory *factory,
            const guchar   *inline_data,
@@ -414,6 +416,7 @@ add_sized (GtkIconFactory *factory,
 
   gtk_icon_set_unref (set);
 }
+#endif
 
 static void
 add_sized_with_fallback (GtkIconFactory *factory,
@@ -449,22 +452,27 @@ static void
 get_default_icons (GtkIconFactory *factory)
 {
   /* KEEP IN SYNC with gtkstock.c */
-  
-  add_sized (factory, stock_dialog_error_48, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_ERROR);
-  add_sized (factory, stock_dialog_info_48, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_INFO);
-  add_sized (factory, stock_dialog_question_48, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_QUESTION);
-  add_sized (factory, stock_dialog_warning_48, GTK_ICON_SIZE_DIALOG, GTK_STOCK_DIALOG_WARNING);
-  
-  /* dnd size only */
-  add_sized (factory, stock_dnd_32, GTK_ICON_SIZE_DND, GTK_STOCK_DND);
-  add_sized (factory, stock_dnd_multiple_32, GTK_ICON_SIZE_DND, GTK_STOCK_DND_MULTIPLE);
-  
-  /* Only have button sizes */
-  add_sized (factory, stock_apply_20, GTK_ICON_SIZE_BUTTON, GTK_STOCK_APPLY);
-  add_sized (factory, stock_cancel_20, GTK_ICON_SIZE_BUTTON, GTK_STOCK_CANCEL);
-  add_sized (factory, stock_no_20, GTK_ICON_SIZE_BUTTON, GTK_STOCK_NO);
-  add_sized (factory, stock_ok_20, GTK_ICON_SIZE_BUTTON, GTK_STOCK_OK);
-  add_sized (factory, stock_yes_20, GTK_ICON_SIZE_BUTTON, GTK_STOCK_YES);
+
+  /* We add all stock icons unsized, since it's confusing if icons only
+   * can be loaded at certain sizes.
+   */
+
+  /* Have dialog size */
+  add_unsized (factory, stock_dialog_error_48, GTK_STOCK_DIALOG_ERROR);
+  add_unsized (factory, stock_dialog_info_48, GTK_STOCK_DIALOG_INFO);
+  add_unsized (factory, stock_dialog_question_48, GTK_STOCK_DIALOG_QUESTION);
+  add_unsized (factory, stock_dialog_warning_48,GTK_STOCK_DIALOG_WARNING);
+  
+  /* Have dnd size */
+  add_unsized (factory, stock_dnd_32, GTK_STOCK_DND);
+  add_unsized (factory, stock_dnd_multiple_32, GTK_STOCK_DND_MULTIPLE);
+  
+  /* Have button sizes */
+  add_unsized (factory, stock_apply_20, GTK_STOCK_APPLY);
+  add_unsized (factory, stock_cancel_20, GTK_STOCK_CANCEL);
+  add_unsized (factory, stock_no_20, GTK_STOCK_NO);
+  add_unsized (factory, stock_ok_20, GTK_STOCK_OK);
+  add_unsized (factory, stock_yes_20, GTK_STOCK_YES);
 
   /* Generic + button sizes */
   add_sized_with_fallback (factory,