Update to 0.6.2.

Submitted by:	Martin Klaffenboeck <martin.klaffenboeck@gmx.at> (partially)

1 files changed, 46 insertions, 109 deletions

diff --git a/net/gnomba/files/patch-ab b/net/gnomba/files/patch-ab
index 6ab1eea3feab..1f11707005a0 100644
--- a/net/gnomba/files/patch-ab
+++ b/net/gnomba/files/patch-ab
@@ -1,5 +1,5 @@
---- properties.c.orig	Sat Mar 25 22:15:19 2000
-+++ properties.c	Sat Mar 25 22:15:42 2000
+--- src/properties.c.orig	Sat Mar 25 22:15:19 2000
++++ src/properties.c	Sat Mar 25 22:15:42 2000
 @@ -158,19 +158,19 @@
    /* set net font property */
    if (strcmp(TNetFont, NetFont)) {
@@ -23,125 +23,62 @@
      gtk_ctree_node_set_cell_style(GTK_CTREE(tree), GTK_CTREE_NODE(node), 2, nodeStyle);
    }
  }
---- smbwrap.c.orig	Sat Mar 25 22:15:23 2000
-+++ smbwrap.c	Sat Mar 25 22:16:26 2000
-@@ -269,17 +269,17 @@
- 
-       /* set net font */
-       nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
--      nodeStyle->font = gdk_font_load(NetFont);
-+      nodeStyle->font = gdk_fontset_load(NetFont);
-       gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 0, nodeStyle);
+--- src/smbwrap.c.orig	Sun Jun 16 13:10:26 2002
++++ src/smbwrap.c	Sun Jun 16 13:12:44 2002
+@@ -246,17 +246,17 @@
+ 			
+ 		/* set net font */
+ 		nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
+-		nodeStyle->font = gdk_font_load(NetFont);
++		nodeStyle->font = gdk_fontset_load(NetFont);
+ 		gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 0, nodeStyle);
  
-       /* set comment font */
-       nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
--      nodeStyle->font = gdk_font_load(CommentFont);
-+      nodeStyle->font = gdk_fontset_load(CommentFont);
-       gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 1, nodeStyle);
+ 		/* set comment font */
+ 		nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
+-		nodeStyle->font = gdk_font_load(CommentFont);
++		nodeStyle->font = gdk_fontset_load(CommentFont);
+ 		gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 1, nodeStyle);
  
-       /* set mount font */
-       nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
--      nodeStyle->font = gdk_font_load(MountFont);
-+      nodeStyle->font = gdk_fontset_load(MountFont);
-       gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 2, nodeStyle);
+ 		/* set mount font */
+ 		nodeStyle = gtk_style_copy(gtk_widget_get_style(GTK_WIDGET(workgrouplist)));
+-		nodeStyle->font = gdk_font_load(MountFont);
++		nodeStyle->font = gdk_fontset_load(MountFont);
+ 		gtk_ctree_node_set_cell_style(GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 2, nodeStyle);
  
-       mn = copyMN(tmp);
-@@ -694,17 +694,17 @@
+ 		mn = copyMN(currnode);
+@@ -629,17 +629,17 @@
  
  	/* set net font */
- 	nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--	nodeStyle->font = gdk_font_load( NetFont ); 
-+	nodeStyle->font = gdk_fontset_load( NetFont ); 
- 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 0, nodeStyle );
+ 	nodeStyle1 = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
+-	nodeStyle1->font = gdk_font_load( NetFont ); 
++	nodeStyle1->font = gdk_fontset_load( NetFont ); 
+ 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 0, nodeStyle1 );
  
  	/* set comment font */
- 	nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--	nodeStyle->font = gdk_font_load( CommentFont ); 
-+	nodeStyle->font = gdk_fontset_load( CommentFont ); 
- 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 1, nodeStyle ); 
+ 	nodeStyle2 = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
+-	nodeStyle2->font = gdk_font_load( CommentFont ); 
++	nodeStyle2->font = gdk_fontset_load( CommentFont ); 
+ 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 1, nodeStyle2 ); 
  
  	/* set mount font */
- 	nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--	nodeStyle->font = gdk_font_load( MountFont ); 
-+	nodeStyle->font = gdk_fontset_load( MountFont ); 
- 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 2, nodeStyle ); 
+ 	nodeStyle3 = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
+-	nodeStyle3->font = gdk_font_load( MountFont ); 
++	nodeStyle3->font = gdk_fontset_load( MountFont ); 
+ 	gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(rootnode), 2, nodeStyle3 ); 
  	
  	
-@@ -728,17 +728,17 @@
-       
- 			/* set net font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( NetFont ); 
-+			nodeStyle->font = gdk_fontset_load( NetFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 0, nodeStyle );
- 			
- 			/* set comment font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( CommentFont ); 
-+			nodeStyle->font = gdk_fontset_load( CommentFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 1, nodeStyle ); 
- 		
- 			/* set mount font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( MountFont ); 
-+			nodeStyle->font = gdk_fontset_load( MountFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 2, nodeStyle ); 
- 			 
- 			
-@@ -758,17 +758,17 @@
- 			
- 			/* set net font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( NetFont ); 
-+			nodeStyle->font = gdk_fontset_load( NetFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(subtree), 0, nodeStyle );
- 			
- 			/* set comment font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( CommentFont ); 
-+			nodeStyle->font = gdk_fontset_load( CommentFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(subtree), 1, nodeStyle ); 
- 		
- 			/* set mount font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( MountFont ); 
-+			nodeStyle->font = gdk_fontset_load( MountFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(subtree), 2, nodeStyle ); 
- 			 
-      
-@@ -787,17 +787,17 @@
-       
- 			/* set net font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( NetFont ); 
-+			nodeStyle->font = gdk_fontset_load( NetFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 0, nodeStyle );
- 			
- 			/* set comment font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( CommentFont ); 
-+			nodeStyle->font = gdk_fontset_load( CommentFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 1, nodeStyle ); 
- 		
- 			/* set mount font */
- 			nodeStyle = gtk_style_copy( gtk_widget_get_style( GTK_WIDGET(workgrouplist) ) );
--			nodeStyle->font = gdk_font_load( MountFont ); 
-+			nodeStyle->font = gdk_fontset_load( MountFont ); 
- 			gtk_ctree_node_set_cell_style( GTK_CTREE(workgrouplist), GTK_CTREE_NODE(node), 2, nodeStyle ); 
- 			 
- 			
---- gnomba.c.orig	Sat Mar 25 22:22:34 2000
-+++ gnomba.c	Sat Mar 25 22:23:28 2000
-@@ -143,9 +143,9 @@
-   DefaultCommand = gnome_config_get_string("Options/DefaultCommand=gmc");
-   SilentlyCreateMountPoint = gnome_config_get_int ("Options/SilentlyCreateMountPoint=0");
-   DontRemoveCreatedMount = gnome_config_get_int ("Options/DontRemoveCreatedMount=0");
--  NetFont = gnome_config_get_string("Options/NetFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
+--- src/gnomba.c.orig	Sun Jun 16 13:09:45 2002
++++ src/gnomba.c	Sun Jun 16 13:10:08 2002
+@@ -133,9 +133,9 @@
+ 	DefaultCommand = gnome_config_get_string("Options/DefaultCommand=gmc");
+ 	SilentlyCreateMountPoint = gnome_config_get_int ("Options/SilentlyCreateMountPoint=0");
+ 	DontRemoveCreatedMount = gnome_config_get_int ("Options/DontRemoveCreatedMount=0");
+-	NetFont = gnome_config_get_string("Options/NetFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
 -	CommentFont = gnome_config_get_string("Options/CommentFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
--  MountFont = gnome_config_get_string("Options/MountFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
-+  NetFont = gnome_config_get_string("Options/NetFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
+-	MountFont = gnome_config_get_string("Options/MountFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1"); 
++	NetFont = gnome_config_get_string("Options/NetFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
 +	CommentFont = gnome_config_get_string("Options/CommentFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
-+  MountFont = gnome_config_get_string("Options/MountFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
- 																								 
++	MountFont = gnome_config_get_string("Options/MountFont=-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1,*"); 
  	gnome_config_pop_prefix();
  
+ 	/*create the containers*/