From e18151212d3326dbf04797c6d5300fb1211ee875 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 5 Nov 2005 04:53:48 +0000 Subject: Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes and new features. Don't believe me? Then see for yourself at http://www.gnome.org/start/2.12/notes/en/. DO NOT USE portupgrade by itself to upgrade to GNOME 2.12. Instead, use the gnome_upgrade.sh script from http://www.marcuscom.com/downloads/gnome_upgrade212.sh. This script will circumvent some potential pitfalls users can see if they use portupgrade by itself. In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special splash screen. The winner of this release's contest is Dominique Goncalves . His splash screen was inspired by http://art.gnome.org/contests/2.12-splash/83. The FreeBSD GNOME Team would lank to thank the following users for their contributions to this release: Matthew Luckie ade sajd on #freebsd-gnome Caelian on #freebsd-gnome mnag Yasuda Keisuke Mark Hobden Sergey Akifyev Andreas Kohn For more information on GNOME on FreeBSD, checkout http://www.FreeBSD.org/gnome/. The 2.12 documentation will be posted shortly. --- .../files/patch-gswitchit_gswitchit-applet.c | 61 ++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c (limited to 'x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c') diff --git a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c new file mode 100644 index 000000000000..5abf18032f00 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c @@ -0,0 +1,61 @@ +--- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005 ++++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005 +@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + XklConfigItem configItem; + GtkWidget *align, *label; + static GHashTable *shortDescrs = NULL; ++ gpointer pcounter = NULL; ++ char *prevLayoutName = NULL; ++ char *labelTitle = NULL; ++ int counter = 0; + if (group == 0) + shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, NULL); +@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + if (layoutName == NULL) + layoutName = g_strdup ("?"); + +- gpointer pcounter = NULL; +- char *prevLayoutName = NULL; +- char *labelTitle = NULL; +- int counter = 0; + if (g_hash_table_lookup_extended (shortDescrs, layoutName, + (gpointer*)&prevLayoutName, &pcounter)) + { +@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo + groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 }; + XklState *xklState = XklGetCurrentState (); + gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group)); ++#ifdef HAVE_XKB ++ GladeXML *gladeData; ++ GtkWidget *dialog; ++ GtkWidget *kbdraw; ++ XkbComponentNamesRec componentNames; ++ XklConfigRec xklData; ++#endif + if (p != NULL) + { + /* existing window */ +@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo + return; + } + #ifdef HAVE_XKB +- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); +- GtkWidget *dialog = ++ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); ++ dialog = + glade_xml_get_widget (gladeData, "gswitchit_layout_view"); +- GtkWidget *kbdraw = keyboard_drawing_new (); +- XkbComponentNamesRec componentNames; ++ kbdraw = keyboard_drawing_new (); + + if (xklState->group >= 0 && + xklState->group < g_slist_length (globals.groupNames)) +@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo + + keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels); + +- XklConfigRec xklData; + XklConfigRecInit (&xklData); + if (XklConfigGetFromServer (&xklData)) + { -- cgit v1.2.3