ports/71242: Maintainer update xchat-gnome gcc34 fixes

[Koop Mast]

>Number:         71242
>Category:       ports
>Synopsis:       Maintainer update xchat-gnome gcc34 fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 01 12:40:12 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Koop Mast
>Release:        FreeBSD 5.3-BETA2 sparc64
>Organization:
>Environment:
System: FreeBSD ultra.rainbow-runner.nl 5.3-BETA2 FreeBSD 5.3-BETA2 #22: Tue Aug 31 13:27:45 CEST 2004 root at ultra.rainbow-runner.nl:/usr/obj/usr/src/sys/BlackBird sparc64


	
>Description:
	Fix gnome-xchat with gcc 3.4.
	
>How-To-Repeat:
	
>Fix:

	

--- xchat-gnome-gcc34.diff begins here ---
diff -ruN xchat-gnome.orig/files/patch-src_fe-gnome_fe-gnome.c xchat-gnome/files/patch-src_fe-gnome_fe-gnome.c
--- xchat-gnome.orig/files/patch-src_fe-gnome_fe-gnome.c	Thu Jan  1 01:00:00 1970
+++ xchat-gnome/files/patch-src_fe-gnome_fe-gnome.c	Wed Sep  1 14:23:40 2004
@@ -0,0 +1,29 @@
+--- src/fe-gnome/fe-gnome.c.orig	Wed Apr 28 02:38:33 2004
++++ src/fe-gnome/fe-gnome.c	Wed Sep  1 14:16:10 2004
+@@ -249,7 +249,7 @@
+ 			add_transfer(dcc);
+ 			break;
+ 
+-		default:
++		default: ;
+ 	}
+ }
+ 
+@@ -260,7 +260,7 @@
+ 			update_transfer(dcc);
+ 			break;
+ 
+-		default:
++		default: ;
+ 	}
+ }
+ 
+@@ -272,7 +272,7 @@
+ 			remove_transfer(dcc);
+ 			break;
+ 
+-		default:
++		default: ;
+ 	}
+ }
+ 
diff -ruN xchat-gnome.orig/files/patch-src_fe-gnome_userlist_gui.c xchat-gnome/files/patch-src_fe-gnome_userlist_gui.c
--- xchat-gnome.orig/files/patch-src_fe-gnome_userlist_gui.c	Thu Jan  1 01:00:00 1970
+++ xchat-gnome/files/patch-src_fe-gnome_userlist_gui.c	Wed Sep  1 14:24:07 2004
@@ -0,0 +1,48 @@
+--- src/fe-gnome/userlist_gui.c.orig	Wed Sep  1 14:19:24 2004
++++ src/fe-gnome/userlist_gui.c	Wed Sep  1 14:21:39 2004
+@@ -52,6 +52,22 @@
+ 	g_signal_connect(G_OBJECT(userlist_view), "button_press_event", G_CALLBACK(userlist_click), NULL);
+ }
+ 
++struct User *userlist_get_selected() {
++	GtkWidget *treeview;
++	GtkTreeSelection *select;
++	GtkTreeModel *model;
++	GtkTreeIter iter;
++	struct User *u;
++
++	treeview = glade_xml_get_widget(gui.xml, "userlist");
++	select = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
++	if(gtk_tree_selection_get_selected(select, &model, &iter)) {
++		gtk_tree_model_get(model, &iter, 2, &u, -1);
++		return u;
++	}
++	return NULL;
++}
++
+ gboolean userlist_click(GtkWidget *view, GdkEventButton *event, gpointer data) {
+ 	GtkTreePath *path;
+ 	GtkTreeSelection *select;
+@@ -77,22 +93,6 @@
+ 		return TRUE;
+ 	}
+ 	return FALSE;
+-}
+-
+-struct User *userlist_get_selected() {
+-	GtkWidget *treeview;
+-	GtkTreeSelection *select;
+-	GtkTreeModel *model;
+-	GtkTreeIter iter;
+-	struct User *u;
+-
+-	treeview = glade_xml_get_widget(gui.xml, "userlist");
+-	select = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+-	if(gtk_tree_selection_get_selected(select, &model, &iter)) {
+-		gtk_tree_model_get(model, &iter, 2, &u, -1);
+-		return u;
+-	}
+-	return NULL;
+ }
+ 
+ void userlist_context(GtkWidget *treeview, struct User *user) {
--- xchat-gnome-gcc34.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: