Added some patches for ISO C90 compliance. Approved by jlam.

4 files changed, 69 insertions, 7 deletions

diff --git a/chat/gg2/distinfo b/chat/gg2/distinfo
index dbbf4a53fc8..36751ebefa3 100644
--- a/chat/gg2/distinfo
+++ b/chat/gg2/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.8 2005/04/04 08:26:29 adam Exp $
+$NetBSD: distinfo,v 1.9 2005/04/13 16:31:26 rillig Exp $
 
 SHA1 (gg2-2.2.5.tar.bz2) = c6642ae186194618019c3467c8d81eb80f5f0c23
 RMD160 (gg2-2.2.5.tar.bz2) = 3871c13c55caa3647bb9d9fa73165f897d11f55d
 Size (gg2-2.2.5.tar.bz2) = 1087478 bytes
 SHA1 (patch-aa) = 1e27a4b03da73dd0c15efd376fe506ef126580d0
-SHA1 (patch-af) = e10417b0247c4ef4c33177eab35b6e27cfc2b21e
+SHA1 (patch-af) = 9e1cc4b53f069e520a165bfed00c8b6692216ce9
 SHA1 (patch-ag) = e98012fda6ca186fecd1fedf0b43a16b0129d5fb
 SHA1 (patch-ah) = b52abe3ed2fe478b7b55df78df299c3d7b706086
+SHA1 (patch-ai) = 39cd62d72007ba875dcb09156d53ab8852328eec
+SHA1 (patch-aj) = 0eeb9ec958e48d9d36f4ae078e51196f1fca158e
diff --git a/chat/gg2/patches/patch-af b/chat/gg2/patches/patch-af
index e40f4d8d89b..8e30c899002 100644
--- a/chat/gg2/patches/patch-af
+++ b/chat/gg2/patches/patch-af
@@ -1,7 +1,9 @@
-$NetBSD: patch-af,v 1.2 2005/04/04 08:26:29 adam Exp $
+$NetBSD: patch-af,v 1.3 2005/04/13 16:31:26 rillig Exp $
 
---- src/plugins/docklet/dockapp/dockapp_plugin.c.orig	2005-02-20 11:31:50.000000000 +0000
-+++ src/plugins/docklet/dockapp/dockapp_plugin.c
+Needed for ISO C90 compliance.
+
+--- src/plugins/docklet/dockapp/dockapp_plugin.c.orig	Sun Feb 20 12:31:50 2005
++++ src/plugins/docklet/dockapp/dockapp_plugin.c	Tue Apr 12 11:48:33 2005
 @@ -109,6 +109,7 @@ void redraw()
  //Przerysowuje elementy dynamiczne pixmapy
  void draw_pixmap()
@@ -18,15 +20,17 @@ $NetBSD: patch-af,v 1.2 2005/04/04 08:26:29 adam Exp $
  
  	//Wyswietl 3 nicki w kolorach zalenych od statusu	
  	for (i = 0; i < NNICK; i++)
-@@ -468,6 +468,7 @@ gpointer user_preferences_action(gpointe
+@@ -468,6 +468,9 @@ gpointer user_preferences_action(gpointe
  //Funkcja startowa pluginu, exportowana,musi byc
  void start_plugin()
  {
 +	XWMHints wmhints;
++	GGaduMenu *root, *item_tl;
++
  	print_debug("%s : start\n", GGadu_PLUGIN_NAME);
  
  	//Etykietki
-@@ -529,7 +530,6 @@ void start_plugin()
+@@ -529,7 +532,6 @@ void start_plugin()
  	redraw();
  
  	//Windowmaker hints - tu sprowadza okno do ikony
@@ -34,3 +38,14 @@ $NetBSD: patch-af,v 1.2 2005/04/04 08:26:29 adam Exp $
  	wmhints.initial_state = WithdrawnState;
  	wmhints.flags = StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
  	wmhints.icon_x = 0;
+@@ -553,8 +555,8 @@ void start_plugin()
+ 	register_signal(handler, "docklet set default icon");
+ 	ggadu_repo_watch_add(NULL, REPO_ACTION_VALUE_CHANGE, REPO_VALUE_CONTACT, notify_callback);
+ 
+-	GGaduMenu *root = ggadu_menu_create();
+-	GGaduMenu *item_tl = ggadu_menu_add_item(root, "_Dockapp", NULL, NULL);
++	root = ggadu_menu_create();
++	item_tl = ggadu_menu_add_item(root, "_Dockapp", NULL, NULL);
+ 		
+ 	ggadu_menu_add_submenu(item_tl, ggadu_menu_new_item(_("_Preferences"), user_preferences_action, NULL));
+ 
diff --git a/chat/gg2/patches/patch-ai b/chat/gg2/patches/patch-ai
new file mode 100644
index 00000000000..ad443bd6cb5
--- /dev/null
+++ b/chat/gg2/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.3 2005/04/13 16:31:26 rillig Exp $
+
+Needed for ISO C90 compliance.
+
+--- src/plugins/GUI/gui_chat.c.orig	Wed Mar  9 15:02:36 2005
++++ src/plugins/GUI/gui_chat.c	Tue Apr 12 11:40:12 2005
+@@ -851,6 +851,7 @@ GtkWidget *create_chat(gui_chat_session 
+ 	gint percent = 0;
+ 	gint number_of_workspaces = 0;
+ 	GtkWidget *chat_notebook_paned_size = NULL;
++	PangoFontDescription *font_desc;
+ 
+ 	if (!session || !plugin_name || !id)
+ 		return NULL;
+@@ -1117,7 +1118,6 @@ GtkWidget *create_chat(gui_chat_session 
+ 
+     /* set font of the message editing text_view */
+ 
+-    PangoFontDescription *font_desc;
+     fontstr = ggadu_config_var_get(gui_handler, "msg_out_edit_font");
+     font_desc = pango_font_description_from_string (fontstr);
+     gtk_widget_modify_font (input, font_desc);
diff --git a/chat/gg2/patches/patch-aj b/chat/gg2/patches/patch-aj
new file mode 100644
index 00000000000..d23a7956afe
--- /dev/null
+++ b/chat/gg2/patches/patch-aj
@@ -0,0 +1,23 @@
+$NetBSD: patch-aj,v 1.3 2005/04/13 16:31:26 rillig Exp $
+
+Needed for ISO C90 compliance.
+
+--- src/plugins/GUI/gui_preferences.c.orig	Wed Mar  9 15:02:37 2005
++++ src/plugins/GUI/gui_preferences.c	Tue Apr 12 11:41:36 2005
+@@ -1315,6 +1315,7 @@ void gui_preferences(GtkWidget * widget,
+ 	{
+ 		GSList *combo_theme_slist;
+ 		GSList *combo_icons_slist;
++		GSList *combo_skins_slist;
+ 		if (plugins_updated)
+ 		{
+ 			GIOChannel *ch = g_io_channel_new_file(g_build_filename(config->configdir, "modules.load", NULL), "w",
+@@ -1433,7 +1434,7 @@ void gui_preferences(GtkWidget * widget,
+ 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_skins");
+ 		g_return_if_fail(entry != NULL);
+ 
+-		GSList *combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist");
++		combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist");
+ 
+ 		if (gtk_combo_box_get_active(GTK_COMBO_BOX(entry))) {
+ 		    ggadu_config_var_set(gui_handler, "skin", (gpointer) g_strdup(g_slist_nth_data(combo_skins_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));