head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.48
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.46
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.44
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.42
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.40
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.38
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.36
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.34
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.32
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.30
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.28
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.26
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.24
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.22
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.20
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.18
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.16
	pkgsrc-2006Q2-base:1.2
	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.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.2
log
@Updated xfce4-xkb-plugin to 0.3.2

* Bug fixes
@
text
@$NetBSD: patch-ab,v 1.1 2004/06/28 01:12:09 kristerw Exp $

--- panel-plugin/xkb.c.orig	Mon Jun 28 02:50:20 2004
+++ panel-plugin/xkb.c	Mon Jun 28 02:57:50 2004
@@@@ -105,16 +105,16 @@@@
   const Atom *group_source;
   Bool status;
   int major, minor, oppcode;
+  XkbStateRec xkb_state;
+  XkbDescRec *kbd_desc_ptr = NULL;
+  int i;
 
   // Initialize the Xkb extension
   status = XkbQueryExtension(dsp, &oppcode,
     &base_event_code, &base_error_code, &major, &minor);
 
-  XkbStateRec xkb_state;
   device_id = XkbUseCoreKbd;
 
-  XkbDescRec *kbd_desc_ptr = NULL;
-
   kbd_desc_ptr = XkbAllocKeyboard();
   if (kbd_desc_ptr == NULL) {
     fprintf(stderr, "Failed to get keyboard description\n");
@@@@ -146,12 +146,12 @@@@
 
   if (group_count == 0) group_count=1;
 
-  int i;
   for (i = 0; i < group_count; i++) {
     group_names[i] = NULL;
     symbol_names[i] = NULL;
   }
 
+  {
   const Atom *tmp_group_source = kbd_desc_ptr->names->groups;
   Atom cur_group_atom;
   char *ptr;
@@@@ -163,6 +163,7 @@@@
         *ptr = '\0';
     }
   }
+  {
   Atom sym_name_atom = kbd_desc_ptr->names->symbols;
   char *sym_name;
   char *ptr1;
@@@@ -251,7 +252,8 @@@@
   current_group_xkb_no = xkb_state.group;
 
   status = True;
-
+  }
+  }
 HastaLaVista:
   if (kbd_desc_ptr) XkbFreeKeyboard(kbd_desc_ptr, 0, True);
   return status;
@@@@ -286,13 +288,14 @@@@
 void set_new_locale(t_xkb *ctrl) {
   t_xkb *plugin = (t_xkb *) ctrl;
   char filename[255];
+  GdkPixbuf *pixbuf, *tmp;
+  int size;
 
   // Set the label  
   gtk_label_set_label((GtkLabel *) plugin->label, get_symbol_name_by_res_no(current_group_xkb_no));
   
   // Set the image
-  GdkPixbuf *pixbuf, *tmp;
-  int size = plugin->size - 4;
+  size = plugin->size - 4;
   tmp = gdk_pixbuf_new_from_file(get_current_gourp_flag_name(filename), NULL);
   if (tmp == NULL) { // could not be loaded for some reason
     printf("in set_new_locale: tmp is NULL\n");
@@@@ -335,10 +338,10 @@@@
 char * initialize_xkb(t_xkb *ctrl) {
   XkbEvent evnt;
   int event_code, error_rtrn, major, minor, reason_rtrn;
+  char * display_name;
   major = XkbMajorVersion;
   minor = XkbMinorVersion;
 
-  char * display_name;
   display_name = "";
   XkbIgnoreExtension(False);
   dsp = XkbOpenDisplay(display_name, &event_code, &error_rtrn, &major, &minor, &reason_rtrn);
@@@@ -362,12 +365,12 @@@@
 
   if (do_init_xkb() != True) return "N/A";
 
+  {
   char *group = get_symbol_name_by_res_no(current_group_xkb_no);
-
+  XkbStateRec state;
   XkbSelectEventDetails(dsp, XkbUseCoreKbd, XkbStateNotify,
                         XkbAllStateComponentsMask, XkbGroupStateMask);
 
-  XkbStateRec state;
   XkbGetState(dsp, device_id, &state);
   current_group_xkb_no = (current_group_xkb_no != state.group) ? state.group : current_group_xkb_no;
   accomodate_group_xkb();
@@@@ -375,6 +378,7 @@@@
   if (ctrl != NULL) set_new_locale(ctrl);
 
   return group;
+  }
 }
 
 static void deinit_group_names() {
@


1.1
log
@Fix some C99 variable definitions, to make this build with gcc 2.95.
@
text
@d1 1
a1 1
$NetBSD$
@