[gq-commit] gq/src mainwin.c,1.45,1.46

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

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

Modified Files:
	mainwin.c 
Log Message:
* Some cleanups wrt to function names and callbacks


Index: mainwin.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** mainwin.c	17 Oct 2003 07:07:06 -0000	1.45
--- mainwin.c	17 Oct 2003 07:19:22 -0000	1.46
***************
*** 58,69 ****
  
  
! 
  
  struct tab *get_last_of_mode(int mode)
  {
- 
       if(!mainwin.lastofmode)
  	  return NULL;
! 
       return g_hash_table_lookup(mainwin.lastofmode, GINT_TO_POINTER(mode));
  }
--- 58,71 ----
  
  
! static void close_current_tab(struct mainwin_data *win);
! static void mainwin_destroyed(GtkWidget *widget, struct mainwin_data *win);
! static void switchpage_refocus(GtkNotebook *notebook, GtkNotebookPage *page,
! 			       int pagenum, struct mainwin_data *win);
  
  struct tab *get_last_of_mode(int mode)
  {
       if(!mainwin.lastofmode)
  	  return NULL;
!      
       return g_hash_table_lookup(mainwin.lastofmode, GINT_TO_POINTER(mode));
  }
***************
*** 176,180 ****
  /* gtk2 checked (multiple destroy callbacks safety), confidence 0.7:
     cleanup_all_tabs semantics? */
! void gq_exit(GtkWidget *widget, struct mainwin_data *win)
  {
       mainwin_save_snapshot(win);
--- 178,182 ----
  /* gtk2 checked (multiple destroy callbacks safety), confidence 0.7:
     cleanup_all_tabs semantics? */
! static void mainwin_destroyed(GtkWidget *widget, struct mainwin_data *win)
  {
       mainwin_save_snapshot(win);
***************
*** 288,292 ****
       gtk_container_border_width(GTK_CONTAINER(win->mainwin), 0);
       gtk_signal_connect(GTK_OBJECT(win->mainwin), "destroy",
! 			GTK_SIGNAL_FUNC(gq_exit),
  			win);
       gtk_window_set_title(GTK_WINDOW(win->mainwin), _("GQ"));
--- 290,294 ----
       gtk_container_border_width(GTK_CONTAINER(win->mainwin), 0);
       gtk_signal_connect(GTK_OBJECT(win->mainwin), "destroy",
! 			GTK_SIGNAL_FUNC(mainwin_destroyed),
  			win);
       gtk_window_set_title(GTK_WINDOW(win->mainwin), _("GQ"));
***************
*** 588,593 ****
  
  
! void switchpage_refocus(GtkNotebook *notebook, GtkNotebookPage *page,
! 			int pagenum, struct mainwin_data *win) {
       GtkWidget *focusbox;
       struct tab *tab;
--- 590,596 ----
  
  
! static void switchpage_refocus(GtkNotebook *notebook, GtkNotebookPage *page,
! 			       int pagenum, struct mainwin_data *win)
! {
       GtkWidget *focusbox;
       struct tab *tab;
***************
*** 616,620 ****
  
  
! void close_current_tab(struct mainwin_data *win)
  {
       int tabnum;
--- 619,623 ----
  
  
! static void close_current_tab(struct mainwin_data *win)
  {
       int tabnum;
***************
*** 691,696 ****
       vbox1 = GTK_DIALOG(window)->vbox;
  /*       gtk_container_border_width(GTK_CONTAINER(vbox1), 20); */
       gtk_widget_show(vbox1);
- 
  
  #if GTK_MAJOR < 2
--- 694,699 ----
       vbox1 = GTK_DIALOG(window)->vbox;
  /*       gtk_container_border_width(GTK_CONTAINER(vbox1), 20); */
+      gtk_container_border_width(GTK_CONTAINER(vbox1), CONTAINER_BORDER_WIDTH);
       gtk_widget_show(vbox1);
  
  #if GTK_MAJOR < 2