[Xmblackberry-devel] XmBlackBerry Makefile.am, 1.33, 1.34 bb_usb.c, 1.142, 1.143 view.c, 1.22, 1.23

[Rick S. <rw...@us...>]

Update of /cvsroot/xmblackberry/XmBlackBerry
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27506

Modified Files:
	Makefile.am bb_usb.c view.c 
Log Message:
some more viewer optimizations
errno usage fix


Index: view.c
===================================================================
RCS file: /cvsroot/xmblackberry/XmBlackBerry/view.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** view.c	22 Jun 2007 18:54:13 -0000	1.22
--- view.c	27 Jun 2007 11:55:54 -0000	1.23
***************
*** 966,969 ****
--- 966,970 ----
  	}
  	info->new_kids[info->num] = CreateRecord(info);
+ 	XtManageChild(info->new_kids[info->num]);
  	info->num++;
  	ret = 1;
***************
*** 975,981 ****
  	    info->name, 
  	    info->num, info->num == 1 ? "" : "s");
! 	XtManageChildren(info->new_kids, info->num_new_kids);
  	XtFree((char *)info->new_kids);
! 	XtSetSensitive(info->notebook, True);
  	XtFree(info->name);
  	*info->locked = False;
--- 976,982 ----
  	    info->name, 
  	    info->num, info->num == 1 ? "" : "s");
! //	XtManageChildren(info->new_kids, info->num_new_kids);
  	XtFree((char *)info->new_kids);
! //	XtSetSensitive(info->notebook, True);
  	XtFree(info->name);
  	*info->locked = False;
***************
*** 1030,1034 ****
  	info->progress = progress;
  	info->notebook = XtNameToWidget(dialog, "*Notebook");
- 	XtSetSensitive(info->notebook, False);
  	info->name = XtNewString(name);
  	info->records = get_database_records(device->desktop->database->database_table, get_database_index(device->desktop->database->database_table, info->name));
--- 1031,1034 ----

Index: bb_usb.c
===================================================================
RCS file: /cvsroot/xmblackberry/XmBlackBerry/bb_usb.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** bb_usb.c	7 Jun 2007 12:46:18 -0000	1.142
--- bb_usb.c	27 Jun 2007 11:55:54 -0000	1.143
***************
*** 435,438 ****
--- 435,439 ----
  ssize_t written;
  int ret = 0;
+ int local_errno;
  
      debug(9, "%s:%s(%d) - read %i write %i\n",
***************
*** 477,480 ****
--- 478,482 ----
  	else
  	{
+ 	    local_errno = errno;
  	    if (num_read >= 0)
  	    {
***************
*** 487,491 ****
  		sizeof(hello),
  		bb->read,
! 		num_read < 0 ? strerror(errno) : "",
  		num_read < 0 ? usb_strerror() : "");
  	}
--- 489,493 ----
  		sizeof(hello),
  		bb->read,
! 		num_read < 0 ? strerror(local_errno) : "",
  		num_read < 0 ? usb_strerror() : "");
  	}
***************
*** 493,496 ****
--- 495,499 ----
      else
      {
+ 	local_errno = errno;
  	if (written >= 0)
  	{
***************
*** 503,507 ****
  	    sizeof(hello),
  	    bb->write,
! 	    written < 0 ? strerror(errno) : "",
  	    written < 0 ? usb_strerror() : "");
      }
--- 506,510 ----
  	    sizeof(hello),
  	    bb->write,
! 	    written < 0 ? strerror(local_errno) : "",
  	    written < 0 ? usb_strerror() : "");
      }

Index: Makefile.am
===================================================================
RCS file: /cvsroot/xmblackberry/XmBlackBerry/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** Makefile.am	3 Jun 2007 12:56:32 -0000	1.33
--- Makefile.am	27 Jun 2007 11:55:54 -0000	1.34
***************
*** 2,6 ****
  EXTRA_DIST = $(hotplug_SCRIPTS) $(hotplug_DATA)
  
! DIST_SUBDIRS = libusb opensync
  
  SUBDIRS = gprs_protocol_fix
--- 2,6 ----
  EXTRA_DIST = $(hotplug_SCRIPTS) $(hotplug_DATA)
  
! DIST_SUBDIRS = libusb opensync $(SUBDIRS)
  
  SUBDIRS = gprs_protocol_fix