[gq-commit] gq/src browse.c,1.78,1.79 input.c,1.67,1.68 mainwin.c,1.43,1.44 prefs.c,1.40,1.41 util.c,1.69,1.70

[<sta...@us...>]

Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv10596

Modified Files:
	browse.c input.c mainwin.c prefs.c util.c 
Log Message:
* Asure it compiles/works with gtk1
* Removed some left-over debug prints


Index: browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** browse.c	11 Oct 2003 22:37:47 -0000	1.78
--- browse.c	12 Oct 2003 06:22:56 -0000	1.79
***************
*** 1175,1181 ****
--- 1175,1183 ----
  				 BROWSETAB(tab)->cur_server->name);
  
+ #if GTK_MAJOR >= 2
       if (BROWSETAB(tab)->mainpane)
  	  state_value_set_int(state_name, "gutter-pos", 
  			      gtk_paned_get_position(GTK_PANED(BROWSETAB(tab)->mainpane)));
+ #endif
  }
  

Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** input.c	12 Oct 2003 05:48:20 -0000	1.67
--- input.c	12 Oct 2003 06:22:57 -0000	1.68
***************
*** 663,667 ****
  #if GTK_MAJOR < 2
       not_in_schema = gtk_style_copy(gtk_widget_get_default_style());
!      not_in_schema->fg[GTK_STATE_NORMAL] = cotcol;
  
       must_in_schema = gtk_style_copy(gtk_widget_get_default_style());
--- 663,667 ----
  #if GTK_MAJOR < 2
       not_in_schema = gtk_style_copy(gtk_widget_get_default_style());
!      not_in_schema->fg[GTK_STATE_NORMAL] = notcol;
  
       must_in_schema = gtk_style_copy(gtk_widget_get_default_style());

Index: mainwin.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** mainwin.c	11 Oct 2003 21:47:51 -0000	1.43
--- mainwin.c	12 Oct 2003 06:22:57 -0000	1.44
***************
*** 238,246 ****
       int i;
  
-      printf("REMOVED TAB 1\n");
- 
       tab = gtk_object_get_data(GTK_OBJECT(content), "tab");
       if (tab) {
- 	  printf("REMOVED TAB 2\n");
  	  thismode = tab->type;
  	  g_hash_table_insert(win->lastofmode, (gpointer) thismode, NULL);
--- 238,243 ----
***************
*** 386,390 ****
       gtk_container_add(GTK_CONTAINER(menuFile), Close);
       gtk_signal_connect_object(GTK_OBJECT(Close), "activate",
! 			       GTK_SIGNAL_FUNC(close_current_tab), win);
       gtk_widget_add_accelerator(Close, "activate", accel_group, 'W',
  				GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
--- 383,388 ----
       gtk_container_add(GTK_CONTAINER(menuFile), Close);
       gtk_signal_connect_object(GTK_OBJECT(Close), "activate",
! 			       GTK_SIGNAL_FUNC(close_current_tab), 
! 			       (gpointer) win);
       gtk_widget_add_accelerator(Close, "activate", accel_group, 'W',
  				GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);

Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** prefs.c	11 Oct 2003 21:47:51 -0000	1.40
--- prefs.c	12 Oct 2003 06:22:57 -0000	1.41
***************
*** 1012,1016 ****
       gtk_signal_connect_object(GTK_OBJECT(cancelbutton), "clicked",
  			       GTK_SIGNAL_FUNC(gtk_widget_destroy),
! 			       editwindow);
       gtk_signal_connect(GTK_OBJECT(editwindow), "key_press_event",
  			GTK_SIGNAL_FUNC(destroy_edit_server_window_on_esc),
--- 1012,1016 ----
       gtk_signal_connect_object(GTK_OBJECT(cancelbutton), "clicked",
  			       GTK_SIGNAL_FUNC(gtk_widget_destroy),
! 			       (gpointer) editwindow);
       gtk_signal_connect(GTK_OBJECT(editwindow), "key_press_event",
  			GTK_SIGNAL_FUNC(destroy_edit_server_window_on_esc),

Index: util.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** util.c	11 Oct 2003 20:45:42 -0000	1.69
--- util.c	12 Oct 2003 06:22:57 -0000	1.70
***************
*** 1755,1764 ****
  {
       int s = -1;
       int n = string->allocated_len;
! 
       va_list ap;
  
       assert(string);
!      printf("gq_g_string_sprintf...\n");
  /*      while (s > string->len || s < 0) { */
       for (;;) {
--- 1755,1767 ----
  {
       int s = -1;
+ #if GTK_MAJOR >= 2
       int n = string->allocated_len;
! #else
!      int n = 0;
! #endif
       va_list ap;
  
       assert(string);
! /*      printf("gq_g_string_sprintf...\n"); */
  /*      while (s > string->len || s < 0) { */
       for (;;) {
***************
*** 1776,1790 ****
  	  }
  
! 	  printf("resizing %d to %d...\n", s, n);
  	  
  #if GTK_MAJOR >= 2
  	  g_string_set_size(string, n + 1);
  #else
! 	  /* Uarghhh, what an ugly hack */
! 	  char *tmp = g_malloc(n + 1);
! 	  memset(tmp, 'x', n);
! 	  tmp[n] = 0;
! 	  g_string_assign(string, tmp);
! 	  g_free(tmp);
  #endif
  	  va_end(ap);
--- 1779,1795 ----
  	  }
  
! /* 	  printf("resizing %d to %d...\n", s, n); */
  	  
  #if GTK_MAJOR >= 2
  	  g_string_set_size(string, n + 1);
  #else
! 	  {
! 	       /* Uarghhh, what an ugly hack */
! 	       char *tmp = g_malloc(n + 1);
! 	       memset(tmp, 'x', n);
! 	       tmp[n] = 0;
! 	       g_string_assign(string, tmp);
! 	       g_free(tmp);
! 	  }
  #endif
  	  va_end(ap);