head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.26 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.24 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.22 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.20 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.18 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.16 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.14 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.12 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.10 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.8 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.6 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.4 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.2 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.3.0.8 pkgsrc-2007Q1-base:1.3 XFCE-4_2_x:1.3 pkgsrc-2006Q4:1.3.0.6 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.3.0.4 pkgsrc-2006Q3-base:1.3 pkgsrc-2006Q2:1.3.0.2 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.2.0.14 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.12 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.10 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.8 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.6 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.4 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.2 pkgsrc-2004Q3-base:1.2; locks; strict; comment @# @; 1.4 date 2007.04.12.09.55.19; author martti; state dead; branches; next 1.3; 1.3 date 2006.05.04.06.14.51; author martti; state Exp; branches; next 1.2; 1.2 date 2004.07.07.11.27.44; author martti; state dead; branches; next 1.1; 1.1 date 2004.06.28.01.12.09; author kristerw; state Exp; branches; next ; desc @@ 1.4 log @Updated to Xfce 4.4.1 See http://www.xfce.org/documentation/changelogs/4.4.1 for details. @ text @$NetBSD: patch-aa,v 1.3 2006/05/04 06:14:51 martti Exp $ --- panel-plugin/xfce4-xkb-plugin.c.orig 2006-05-04 06:04:50.000000000 +0300 +++ panel-plugin/xfce4-xkb-plugin.c 2006-05-04 06:06:13.000000000 +0300 @@@@ -77,6 +77,7 @@@@ static t_xkb * xkb_new(void) { t_xkb *xkb; char *initial_group; + NetkScreen* netk_screen; xkb = g_new(t_xkb, 1); @@@@ -122,7 +123,7 @@@@ plugin = xkb; // track signals about window change - NetkScreen* netk_screen = netk_screen_get_default (); + netk_screen = netk_screen_get_default (); win_change_hanler = g_signal_connect( G_OBJECT (netk_screen), "active_window_changed", G_CALLBACK(active_window_changed), NULL); @ 1.3 log @Added patch-aa for compatibility with ISO C90. @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Updated xfce4-xkb-plugin to 0.3.2 * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2004/06/28 01:12:09 kristerw Exp $ d3 7 a9 3 --- panel-plugin/xfce4-xkb-plugin.c.orig Mon Jun 28 02:48:38 2004 +++ panel-plugin/xfce4-xkb-plugin.c Mon Jun 28 02:50:08 2004 @@@@ -87,7 +87,7 @@@@ d11 1 a11 1 xkb_refresh_gui(xkb); d13 2 a14 2 - char *initial_group = initialize_xkb(xkb); + initialize_xkb(xkb); d16 5 a20 4 channel = g_io_channel_unix_new(get_connection_number()); source_id = g_io_add_watch(channel, G_IO_IN | G_IO_PRI, (GIOFunc) &gio_callback, (gpointer) xkb); @@@@ -113,10 +113,9 @@@@ } a21 9 static void xkb_free(Control *ctrl) { + t_xkb *xkb; g_source_remove(source_id); deinitialize_xkb(); - - t_xkb *xkb; g_return_if_fail(ctrl != NULL); g_return_if_fail(ctrl->data != NULL); @ 1.1 log @Fix some C99 variable definitions, to make this build with gcc 2.95. @ text @d1 1 a1 1 $NetBSD$ @