1 diff -Nuard gnome-panel-2.4.1.orig/gnome-panel/ChangeLog gnome-panel-2.4.1/gnome-panel/ChangeLog
2 --- gnome-panel-2.4.1.orig/gnome-panel/ChangeLog 2003-10-14 12:46:22.000000000 +0200
3 +++ gnome-panel-2.4.1/gnome-panel/ChangeLog 2003-11-28 00:41:15.065892216 +0100
5 +2003-11-28 Marcin Krzyzanowski <krzak@linux.net.pl>
7 + * menu.c: (create_applets_menu):
8 + Guess untranslated categories based on translated ones, what give
9 + us better menu order with translated and untranslated (the same)
10 + categories. Fix bug #127732
12 2003-10-13 Owen Taylor <otaylor@redhat.com>
14 * gnome-panel/panel-stock-icons.c (panel_init_stock_icons):
15 diff -Nuard gnome-panel-2.4.1.orig/gnome-panel/menu.c gnome-panel-2.4.1/gnome-panel/menu.c
16 --- gnome-panel-2.4.1.orig/gnome-panel/menu.c 2003-10-14 12:46:30.000000000 +0200
17 +++ gnome-panel-2.4.1/gnome-panel/menu.c 2003-11-28 00:28:09.436326064 +0100
18 @@ -2680,10 +2680,10 @@
22 - if ((c = strcmp (a->category, b->category)))
23 + if ((c = g_utf8_collate (a->category, b->category)))
26 - return strcmp (a->name, b->name);
27 + return g_utf8_collate (a->name, b->name);
33 GtkWidget *prev_menu = NULL;
34 const char *prev_category = NULL;
37 const GList *langs_glist;
39 GSList *applets = NULL;
40 @@ -2771,6 +2771,20 @@
42 applets = g_slist_append (applets, applet);
45 + /* try to guess translations looking for already translated categories */
46 + for (j = 0; j < g_slist_length(applets); j++) {
47 + AppletMenuInfo *appletA = (AppletMenuInfo *) g_slist_nth_data (applets,j);
49 + if (!g_utf8_collate (appletA->category,appletA->untranslated_category)) {
50 + for (k = 0; k < g_slist_length(applets); k++) {
51 + AppletMenuInfo *appletB = (AppletMenuInfo *) g_slist_nth_data (applets,k);
53 + if (!g_utf8_collate (appletA->untranslated_category,appletB->untranslated_category))
54 + appletA->category = appletB->category;
59 /* add internal action buttons */
60 applets = append_internal_applets (applets);