head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.10 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.8 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.6 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.4 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.2 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.4.0.2 pkgsrc-2009Q3-base:1.4 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.1.0.8 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.6 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.4 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.2; locks; strict; comment @# @; 1.5 date 2009.10.22.17.09.35; author drochner; state dead; branches; next 1.4; 1.4 date 2009.08.14.15.47.31; author wiz; state Exp; branches; next 1.3; 1.3 date 2009.03.15.14.49.01; author jmcneill; state dead; branches; next 1.2; 1.2 date 2008.12.21.00.29.02; author jmcneill; state Exp; branches; next 1.1; 1.1 date 2008.06.02.16.42.21; author drochner; state Exp; branches; next ; desc @@ 1.5 log @update to 2.28.0 This switches to the gnome-2.28 release branch. @ text @$NetBSD: patch-ac,v 1.4 2009/08/14 15:47:31 wiz Exp $ --- libgnomekbd/gkbd-indicator.c.orig 2009-03-13 23:01:12.000000000 +0000 +++ libgnomekbd/gkbd-indicator.c @@@@ -717,7 +717,7 @@@@ gkbd_indicator_global_init (void) globals.registry = xkl_config_registry_get_instance (globals.engine); - xkl_config_registry_load (globals.registry); + xkl_config_registry_load (globals.registry, FALSE); gconf_client = gconf_client_get_default (); @ 1.4 log @Fix build with libxklavier-4.0, and depend on it. Bump PKGREVISION. Patch from gentoo, linked to by hasso. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update libgnomekbd to 2.26.0. Changes: 2009-03-13 svu * configure.in, NEWS: preparing 2.26.0 2009-02-25 svu * libgnomekbd/gkbd-indicator.c: use updated tooltips API, closing #550212 * capplet/gkbd-indicator-plugins-capplet.c: fixed signal API, closing #572661 2009-02-19 svu * configure.in, NEWS: preparing 2.25.91 2009-02-09 svu * libgnomekbd/gkbd-indicator-config.c: deprecate gdk_pixbuf_unref, closing #570951 2008-12-09 Pedro Fragoso * capplet/gkbd-indicator-plugins-capplet.h: * test/gkbd-indicator-test.c: * test/gkbd-keyboard-drawing-test.c: GNOME Goal: Clean up GLib and GTK+ includes (Closes: #563629) 2008-11-09 svu * libgnomekbd/gkbd-keyboard-config.c: fixed memleak, http://bugzilla.gnome.org/show_bug.cgi?id=549874 2008-10-27 svu * libgnomekbd/gkbd-indicator.c: fixing crash in broken X configuration, http://bugzilla.gnome.org/show_bug.cgi?id=553915 2008-09-28 svu * libgnomekbd/gkbd-keyboard-drawing.c: make default orientation (for printing) landscape, http://bugzilla.gnome.org/show_bug.cgi?id=553491 @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2008/12/21 00:29:02 jmcneill Exp $ d3 5 a7 5 --- libgnomekbd/gkbd-indicator.c.orig 2008-12-20 19:23:49.000000000 -0500 +++ libgnomekbd/gkbd-indicator.c 2008-12-20 19:23:55.000000000 -0500 @@@@ -17,6 +17,8 @@@@ * Boston, MA 02111-1307, USA. */ d9 2 a10 3 +#include + #include d12 1 a12 3 #include @@@@ -135,7 +137,12 @@@@ gkbd_indicator_fill (GkbdIndicator * gki GtkNotebook *notebook = GTK_NOTEBOOK (gki); a13 191 for (grp = 0; grp < total_groups; grp++) { - GtkWidget *page, *decorated_page; + GtkWidget *page, *decorated_page = NULL; + gchar *full_group_name = + (grp < + g_strv_length (globals. + full_group_names)) ? + globals.full_group_names[grp] : "?"; page = gkbd_indicator_prepare_drawing (gki, grp); if (page == NULL) @@@@ -144,7 +151,7 @@@@ gkbd_indicator_fill (GkbdIndicator * gki decorated_page = gkbd_indicator_plugin_manager_decorate_widget (&globals.plugin_manager, page, grp, - globals.full_group_names[grp], &globals.kbd_cfg); + full_group_name, &globals.kbd_cfg); page = decorated_page == NULL ? page : decorated_page; @@@@ -257,39 +264,46 @@@@ gkbd_indicator_prepare_drawing (GkbdIndi g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - if (xkl_engine_get_features (globals.engine) & - XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { - char *full_layout_name = - (char *) g_slist_nth_data (globals.kbd_cfg. - layouts_variants, - group); - char *variant_name; - if (!gkbd_keyboard_config_split_items - (full_layout_name, &layout_name, - &variant_name)) - /* just in case */ - layout_name = full_layout_name; - - /* make it freeable */ - layout_name = g_strdup (layout_name); - - if (globals.short_group_names != NULL) { - char *short_group_name = - globals.short_group_names[group]; - if (short_group_name != NULL - && *short_group_name != '\0') { - /* drop the long name */ - g_free (layout_name); - layout_name = - g_strdup (short_group_name); + + if (group < g_strv_length (globals.short_group_names)) { + if (xkl_engine_get_features (globals.engine) & + XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { + char *full_layout_name = (char *) + g_slist_nth_data (globals.kbd_cfg. + layouts_variants, + group); + char *variant_name; + if (!gkbd_keyboard_config_split_items + (full_layout_name, &layout_name, + &variant_name)) + /* just in case */ + layout_name = full_layout_name; + + /* make it freeable */ + layout_name = g_strdup (layout_name); + + if (globals.short_group_names != NULL) { + char *short_group_name = + globals.short_group_names + [group]; + if (short_group_name != NULL + && *short_group_name != '\0') { + /* drop the long name */ + g_free (layout_name); + layout_name = + g_strdup + (short_group_name); + } } + } else { + layout_name = + g_strdup (globals.full_group_names + [group]); } - } else - layout_name = - g_strdup (globals.full_group_names[group]); + } if (layout_name == NULL) - layout_name = g_strdup ("?"); + layout_name = g_strdup ("??"); /* Process layouts with repeating description */ ppln = &prev_layout_name; @@@@ -306,7 +320,7 @@@@ gkbd_indicator_prepare_drawing (GkbdIndi utf8length = g_unichar_to_utf8 (cidx, appendix); appendix[utf8length] = '\0'; lbl_title = - g_strconcat (layout_name, appendix, NULL); + g_strconcat (layout_name, appendix, VPNULL); } else { /* "first" time this description */ lbl_title = g_strdup (layout_name); @@@@ -347,7 +361,8 @@@@ gkbd_indicator_update_tooltips (GkbdIndi { XklState *state = xkl_engine_get_current_state (globals.engine); gchar *buf; - if (state == NULL || state->group < 0) + if (state == NULL || state->group < 0 + || state->group >= g_strv_length (globals.full_group_names)) return; buf = g_strdup_printf (globals.tooltips_format, @@@@ -401,12 +416,9 @@@@ gkbd_indicator_ind_cfg_changed (GConfCli &globals.kbd_cfg); gkbd_indicator_config_activate (&globals.ind_cfg); - gkbd_indicator_plugin_manager_toggle_plugins (&globals. - plugin_manager, - &globals. - plugin_container, - globals.ind_cfg. - enabled_plugins); + gkbd_indicator_plugin_manager_toggle_plugins + (&globals.plugin_manager, &globals.plugin_container, + globals.ind_cfg.enabled_plugins); ForAllIndicators () { gkbd_indicator_reinit_ui (gki); @@@@ -465,8 +477,8 @@@@ gkbd_indicator_kbd_cfg_callback (GkbdInd } gkbd_indicator_load_group_names ((const gchar **) xklrec->layouts, - (const gchar **) xklrec-> - variants); + (const gchar **) + xklrec->variants); ForAllIndicators () { gkbd_indicator_reinit_ui (gki); @@@@ -664,8 +676,8 @@@@ gkbd_indicator_global_term (void) gkbd_desktop_config_stop_listen (&globals.cfg); gkbd_indicator_config_stop_listen (&globals.ind_cfg); - gkbd_indicator_plugin_manager_term_initialized_plugins (&globals. - plugin_manager); + gkbd_indicator_plugin_manager_term_initialized_plugins + (&globals.plugin_manager); gkbd_indicator_plugin_manager_term (&globals.plugin_manager); gkbd_indicator_config_term (&globals.ind_cfg); @@@@ -756,18 +768,14 @@@@ gkbd_indicator_global_init (void) gkbd_indicator_config_activate (&globals.ind_cfg); gkbd_indicator_load_group_names ((const gchar **) xklrec->layouts, - (const gchar **) xklrec-> - variants); + (const gchar **) + xklrec->variants); g_object_unref (G_OBJECT (xklrec)); gkbd_indicator_plugin_manager_init (&globals.plugin_manager); - gkbd_indicator_plugin_manager_init_enabled_plugins (&globals. - plugin_manager, - &globals. - plugin_container, - globals. - ind_cfg. - enabled_plugins); + gkbd_indicator_plugin_manager_init_enabled_plugins + (&globals.plugin_manager, &globals.plugin_container, + globals.ind_cfg.enabled_plugins); gkbd_desktop_config_start_listen (&globals.cfg, (GConfClientNotifyFunc) gkbd_indicator_cfg_changed, @@@@ -821,10 +829,9 @@@@ gkbd_indicator_get_image_filename (guint { if (!globals.ind_cfg.show_flags) return NULL; - return gkbd_indicator_config_get_images_file (&globals. - ind_cfg, - &globals. - kbd_cfg, group); + return gkbd_indicator_config_get_images_file (&globals.ind_cfg, + &globals.kbd_cfg, + group); } gdouble @ 1.2 log @Pull in patch from libgnomekbd trunk that prevents a crash when a buggy X server fails a XkbGetKeyboard call. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @make it build on DragonFly, from Hasso Tepper by PR pkg/38806, slightly modified by me @ text @d3 2 a4 2 --- libgnomekbd/gkbd-indicator.c.orig 2007-10-08 17:18:41.000000000 +0200 +++ libgnomekbd/gkbd-indicator.c d14 100 a113 1 @@@@ -306,7 +308,7 @@@@ gkbd_indicator_prepare_drawing (GkbdIndi d122 86 @