pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] SF.net SVN: gaim: [17097] trunk/console

[<the...@us...>]

Revision: 17097
          http://svn.sourceforge.net/gaim/?rev=17097&view=rev
Author:   thekingant
Date:     2006-08-31 01:58:36 -0700 (Thu, 31 Aug 2006)

Log Message:
-----------
Add two things to the svn:ignore property

Property Changed:
----------------
    trunk/console/
    trunk/console/plugins/


Property changes on: trunk/console
___________________________________________________________________
Name: svn:ignore
   - Makefile.in
gmon.out
.libs
.deps
Makefile
.error

   + Makefile.in
gmon.out
gntgaim
.libs
.deps
Makefile
.error



Property changes on: trunk/console/plugins
___________________________________________________________________
Name: svn:ignore
   - Makefile.in
.deps
Makefile

   + Makefile.in
.deps
.libs
Makefile



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17096] trunk/console/libgnt

[<sa...@us...>]

Revision: 17096
          http://svn.sourceforge.net/gaim/?rev=17096&view=rev
Author:   sadrul
Date:     2006-08-30 23:39:20 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Give a bit more control to the window-manager about the size/position of
a window. Also, give the WM an opportunity to do its thing when the window
changes something (eg. title, 'urgency').

Modified Paths:
--------------
    trunk/console/libgnt/gntbox.c
    trunk/console/libgnt/gntmain.c
    trunk/console/libgnt/gntwm.h
    trunk/console/libgnt/wms/s.c

Modified: trunk/console/libgnt/gntbox.c
===================================================================
--- trunk/console/libgnt/gntbox.c	2006-08-31 05:58:32 UTC (rev 17095)
+++ trunk/console/libgnt/gntbox.c	2006-08-31 06:39:20 UTC (rev 17096)
@@ -67,6 +67,7 @@
 		int pos, right;
 		char *title = g_strdup(box->title);
 		
+		mvwhline(widget->window, 0, 1, ACS_HLINE | COLOR_PAIR(GNT_COLOR_NORMAL), widget->priv.width - 2);
 		get_title_thingies(box, title, &pos, &right);
 
 		if (gnt_widget_has_focus(widget))

Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-08-31 05:58:32 UTC (rev 17095)
+++ trunk/console/libgnt/gntmain.c	2006-08-31 06:39:20 UTC (rev 17096)
@@ -81,7 +81,11 @@
 {
 	NULL,   /* new_window */
 	NULL,   /* close_window */
+	NULL,   /* window_resize_confirm */
 	NULL,   /* window_resized */
+	NULL,   /* window_move_confirm */
+	NULL,   /* window_moved */
+	NULL,   /* window_update */
 	NULL,   /* key_pressed */
 	NULL,   /* mouse clicked */
 	bring_on_top, /* give_focus */
@@ -229,6 +233,10 @@
 			/* This is the current window in focus */
 			color = GNT_COLOR_TITLE;
 			GNT_WIDGET_UNSET_FLAGS(w, GNT_WIDGET_URGENT);
+			if (wm.window_update) {
+				GntNode *node = g_hash_table_lookup(nodes, w);
+				wm.window_update(node->panel, w);
+			}
 		} else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_URGENT)) {
 			/* This is a window with the URGENT hint set */
 			color = GNT_COLOR_URGENT;
@@ -1145,6 +1153,12 @@
 		return;
 
 	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_URGENT);
+
+	if (wm.window_update) {
+		GntNode *node = g_hash_table_lookup(nodes, widget);
+		wm.window_update(node->panel, widget);
+	}
+
 	draw_taskbar(FALSE);
 }
 
@@ -1168,6 +1182,9 @@
 		if (!node)
 			return;
 
+		if (wm.window_resize_confirm && !wm.window_resize_confirm(widget, &width, &height))
+			return;
+
 		hide_panel(node->panel);
 		gnt_widget_set_size(widget, width, height);
 		gnt_widget_draw(widget);
@@ -1183,8 +1200,16 @@
 void gnt_screen_move_widget(GntWidget *widget, int x, int y)
 {
 	GntNode *node = g_hash_table_lookup(nodes, widget);
+
+	if (wm.window_move_confirm && !wm.window_move_confirm(widget, &x, &y))
+		return;
+
 	gnt_widget_set_position(widget, x, y);
 	move_panel(node->panel, y, x);
+
+	if (wm.window_moved)
+		wm.window_moved(node->panel, widget);
+
 	update_screen(NULL);
 }
 
@@ -1192,6 +1217,12 @@
 {
 	gnt_box_set_title(GNT_BOX(widget), text);
 	gnt_widget_draw(widget);
+
+	if (wm.window_update) {
+		GntNode *node = g_hash_table_lookup(nodes, widget);
+		wm.window_update(node->panel, widget);
+	}
+
 	draw_taskbar(FALSE);
 }
 

Modified: trunk/console/libgnt/gntwm.h
===================================================================
--- trunk/console/libgnt/gntwm.h	2006-08-31 05:58:32 UTC (rev 17095)
+++ trunk/console/libgnt/gntwm.h	2006-08-31 06:39:20 UTC (rev 17096)
@@ -6,6 +6,8 @@
 
 #include "gntwidget.h"
 
+/* XXX: It might be a good idea to move GntNode from gntmain.c to here. */
+
 typedef struct _GntWM GntWM;
 
 struct _GntWM
@@ -16,10 +18,24 @@
 	/* This is called when a window is being closed */
 	gboolean (*close_window)(GntWidget *win);
 
+	/* The WM may want to confirm a size for a window first */
+	gboolean (*window_resize_confirm)(GntWidget *win, int *w, int *h);
+
 	/* Can del_panel the old panel and return a new_panel.
 	 * Otherwise, this should at least do a replace_panel. */
 	PANEL *(*window_resized)(PANEL *pan, GntWidget *win);
 
+	/* The WM may want to confirm the position of a window */
+	gboolean (*window_move_confirm)(GntWidget *win, int *x, int *y);
+
+	void (*window_moved)(PANEL *pan, GntWidget *win);
+
+	/* This gets called when:
+	 * 	 - the title of the window changes
+	 * 	 - the 'urgency' of the window changes
+	 */
+	void (*window_update)(PANEL *pan, GntWidget *win);
+
 	/* This should usually return NULL if the keys were processed by the WM.
 	 * If not, the WM can simply return the original string, which will be
 	 * processed by the default WM. The custom WM can also return a different

Modified: trunk/console/libgnt/wms/s.c
===================================================================
--- trunk/console/libgnt/wms/s.c	2006-08-31 05:58:32 UTC (rev 17095)
+++ trunk/console/libgnt/wms/s.c	2006-08-31 06:39:20 UTC (rev 17096)
@@ -156,6 +156,14 @@
 	return FALSE;
 }
 
+static void
+s_window_update(PANEL *panel, GntWidget *window)
+{
+	const char *name = gnt_widget_get_name(window);
+	if (name && strcmp(name, "buddylist"))
+		envelope_normal_window(window);
+}
+
 void gntwm_init(GntWM *wm)
 {
 	gwm = wm;
@@ -163,5 +171,6 @@
 	wm->window_resized = s_resize_window;
 	wm->key_pressed = s_key_pressed;
 	wm->mouse_clicked = s_mouse_clicked;
+	wm->window_update = s_window_update;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17095] trunk/console/libgnt/gntbox.c

[<sa...@us...>]

Revision: 17095
          http://svn.sourceforge.net/gaim/?rev=17095&view=rev
Author:   sadrul
Date:     2006-08-30 22:58:32 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Completely redrawing the topmost line of a window causes the [X] to be
overwritten. So now only the region of the old title will be restored.

Modified Paths:
--------------
    trunk/console/libgnt/gntbox.c

Modified: trunk/console/libgnt/gntbox.c
===================================================================
--- trunk/console/libgnt/gntbox.c	2006-08-31 04:39:21 UTC (rev 17094)
+++ trunk/console/libgnt/gntbox.c	2006-08-31 05:58:32 UTC (rev 17095)
@@ -25,6 +25,32 @@
 }
 
 static void
+get_title_thingies(GntBox *box, char *title, int *p, int *r)
+{
+	GntWidget *widget = GNT_WIDGET(box);
+	int pos = g_utf8_strlen(title, -1), right;
+
+	if (pos >= widget->priv.width - 4)
+	{
+		g_utf8_strncpy(title, title, widget->priv.width - 4);
+		pos = 2;
+		right = pos + g_utf8_strlen(title, -1);
+	}
+	else
+	{
+		/* XXX: Position of the title might be configurable */
+		right = pos;
+		pos = (widget->priv.width - pos) / 2;
+		right += pos;
+	}
+
+	if (p)
+		*p = pos;
+	if (r)
+		*r = right;
+}
+
+static void
 gnt_box_draw(GntWidget *widget)
 {
 	GntBox *box = GNT_BOX(widget);
@@ -38,26 +64,11 @@
 
 	if (box->title && !GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_NO_BORDER))
 	{
-		gchar *title = g_strdup(box->title);
-		int pos = g_utf8_strlen(title, -1), right;
+		int pos, right;
+		char *title = g_strdup(box->title);
+		
+		get_title_thingies(box, title, &pos, &right);
 
-		mvwhline(widget->window, 0, 1, ACS_HLINE | COLOR_PAIR(GNT_COLOR_NORMAL),
-				widget->priv.width - 2);
-
-		if (pos >= widget->priv.width - 4)
-		{
-			g_utf8_strncpy(title, box->title, widget->priv.width - 4);
-			pos = 2;
-			right = pos + g_utf8_strlen(title, -1);
-		}
-		else
-		{
-			/* XXX: Position of the title might be configurable */
-			right = pos;
-			pos = (widget->priv.width - pos) / 2;
-			right += pos;
-		}
-
 		if (gnt_widget_has_focus(widget))
 			wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_TITLE));
 		else
@@ -578,8 +589,17 @@
 
 void gnt_box_set_title(GntBox *b, const char *title)
 {
-	g_free(b->title);
+	char *prev = b->title;
+	GntWidget *w = GNT_WIDGET(b);
 	b->title = g_strdup(title);
+	if (w->window && !GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_NO_BORDER)) {
+		/* Erase the old title */
+		int pos, right;
+		get_title_thingies(b, prev, &pos, &right);
+		mvwhline(w->window, 0, pos - 1, ACS_HLINE | COLOR_PAIR(GNT_COLOR_NORMAL),
+				right - pos + 2);
+		g_free(prev);
+	}
 }
 
 void gnt_box_set_pad(GntBox *box, int pad)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17094] trunk/console

[<sa...@us...>]

Revision: 17094
          http://svn.sourceforge.net/gaim/?rev=17094&view=rev
Author:   sadrul
Date:     2006-08-30 21:39:21 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Contactize the conversations.

Modified Paths:
--------------
    trunk/console/gntblist.c
    trunk/console/gntconv.c
    trunk/console/gntconv.h
    trunk/console/libgnt/gnt.h
    trunk/console/libgnt/gntbox.c
    trunk/console/libgnt/gntmain.c

Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c	2006-08-31 03:13:54 UTC (rev 17093)
+++ trunk/console/gntblist.c	2006-08-31 04:39:21 UTC (rev 17094)
@@ -17,6 +17,7 @@
 #include "gnttree.h"
 
 #include "gntblist.h"
+#include "gntconv.h"
 #include "gntstatus.h"
 #include <string.h>
 
@@ -496,9 +497,10 @@
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 	{
 		GaimBuddy *buddy = (GaimBuddy *)node;
-		gaim_conversation_new(GAIM_CONV_TYPE_IM,
-				gaim_buddy_get_account(buddy),
-				gaim_buddy_get_name(buddy));
+		GaimConversation *conv =  gaim_conversation_new(GAIM_CONV_TYPE_IM,
+					gaim_buddy_get_account(buddy),
+					gaim_buddy_get_name(buddy));
+		gg_conversation_set_active(conv);
 	}
 	else if (GAIM_BLIST_NODE_IS_CHAT(node))
 	{

Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c	2006-08-31 03:13:54 UTC (rev 17093)
+++ trunk/console/gntconv.c	2006-08-31 04:39:21 UTC (rev 17094)
@@ -22,15 +22,15 @@
 
 #include "config.h"
 
-GHashTable *ggconvs;
-
 typedef struct _GGConv GGConv;
 typedef struct _GGConvChat GGConvChat;
 typedef struct _GGConvIm GGConvIm;
 
 struct _GGConv
 {
-	GaimConversation *conv;
+	GList *list;
+	GaimConversation *active_conv;
+	/*GaimConversation *conv;*/
 
 	GntWidget *window;        /* the container */
 	GntWidget *entry;         /* entry */
@@ -61,7 +61,7 @@
 		const char *text = gnt_entry_get_text(GNT_ENTRY(ggconv->entry));
 		if (*text == '/')
 		{
-			GaimConversation *conv = ggconv->conv;
+			GaimConversation *conv = ggconv->active_conv;
 			GaimCmdStatus status;
 			const char *cmdline = text + 1;
 			char *error = NULL, *escape;
@@ -112,13 +112,13 @@
 		else
 		{
 			char *escape = g_markup_escape_text(text, -1);
-			switch (gaim_conversation_get_type(ggconv->conv))
+			switch (gaim_conversation_get_type(ggconv->active_conv))
 			{
 				case GAIM_CONV_TYPE_IM:
-					gaim_conv_im_send_with_flags(GAIM_CONV_IM(ggconv->conv), escape, GAIM_MESSAGE_SEND);
+					gaim_conv_im_send_with_flags(GAIM_CONV_IM(ggconv->active_conv), escape, GAIM_MESSAGE_SEND);
 					break;
 				case GAIM_CONV_TYPE_CHAT:
-					gaim_conv_chat_send(GAIM_CONV_CHAT(ggconv->conv), escape);
+					gaim_conv_chat_send(GAIM_CONV_CHAT(ggconv->active_conv), escape);
 					break;
 				default:
 					g_free(escape);
@@ -151,8 +151,13 @@
 static void
 closing_window(GntWidget *window, GGConv *ggconv)
 {
+	GList *list = ggconv->list;
 	ggconv->window = NULL;
-	gaim_conversation_destroy(ggconv->conv);
+	while (list) {
+		GaimConversation *conv = list->data;
+		list = list->next;
+		gaim_conversation_destroy(conv);
+	}
 }
 
 static void
@@ -169,24 +174,55 @@
 	gaim_prefs_set_int(PREF_ROOT "/position/y", y);
 }
 
+static GaimConversation *
+find_conv_with_contact(GaimConversation *conv)
+{
+	GaimBlistNode *node;
+	GaimBuddy *buddy = gaim_find_buddy(conv->account, conv->name);
+	GaimConversation *ret = NULL;
+
+	if (!buddy)
+		return NULL;
+
+	for (node = ((GaimBlistNode*)buddy)->parent->child; node; node = node->next) {
+		if (node == (GaimBlistNode*)buddy)
+			continue;
+		if ((ret = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM,
+				((GaimBuddy*)node)->name, ((GaimBuddy*)node)->account)) != NULL)
+			break;
+	}
+	return ret;
+}
+
 static void
 gg_create_conversation(GaimConversation *conv)
 {
-	GGConv *ggc = g_hash_table_lookup(ggconvs, conv);
+	GGConv *ggc = conv->ui_data;
 	char *title;
 	GaimConversationType type;
+	GaimConversation *cc;
 
 	if (ggc)
 		return;
 
-	ggc = g_new0(GGConv, 1);
-	g_hash_table_insert(ggconvs, conv, ggc);
+	cc = find_conv_with_contact(conv);
+	if (cc && cc->ui_data)
+		ggc = cc->ui_data;
+	else
+		ggc = g_new0(GGConv, 1);
 
-	ggc->conv = conv;
+	ggc->list = g_list_prepend(ggc->list, conv);
+	ggc->active_conv = conv;
 	conv->ui_data = ggc;
 
+	if (cc && cc->ui_data) {
+		gg_conversation_set_active(conv);
+		return;
+	}
+
 	type = gaim_conversation_get_type(conv);
 	title = g_strdup_printf(_("%s"), gaim_conversation_get_title(conv));
+	
 	ggc->window = gnt_box_new(FALSE, TRUE);
 	gnt_box_set_title(GNT_BOX(ggc->window), title);
 	gnt_box_set_toplevel(GNT_BOX(ggc->window), TRUE);
@@ -222,20 +258,36 @@
 static void
 gg_destroy_conversation(GaimConversation *conv)
 {
-	g_hash_table_remove(ggconvs, conv);
+	/* do stuff here */
+	GGConv *ggc = conv->ui_data;
+	ggc->list = g_list_remove(ggc->list, conv);
+	if (ggc->list && conv == ggc->active_conv)
+		ggc->active_conv = ggc->list->data;
+	
+	if (ggc->list == NULL) {
+		gnt_widget_destroy(ggc->window);
+		g_free(ggc);
+	}
 }
 
 static void
 gg_write_common(GaimConversation *conv, const char *who, const char *message,
 		GaimMessageFlags flags, time_t mtime)
 {
-	GGConv *ggconv = g_hash_table_lookup(ggconvs, conv); /* XXX: ggconv = conv->ui_data; should do */
+	GGConv *ggconv = conv->ui_data;
 	char *strip, *newline;
 	GntTextFormatFlags fl = 0;
 	int pos;
 
 	g_return_if_fail(ggconv != NULL);
 
+	if (ggconv->active_conv != conv) {
+		if (flags & (GAIM_MESSAGE_SEND | GAIM_MESSAGE_RECV))
+			gg_conversation_set_active(conv);
+		else
+			return;
+	}
+
 	pos = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggconv->tv));
 
 	gnt_text_view_next_line(GNT_TEXT_VIEW(ggconv->tv));
@@ -408,14 +460,6 @@
 	.custom_smiley_close = NULL
 };
 
-static void
-destroy_ggconv(gpointer data)
-{
-	GGConv *ggconv = data;
-	gnt_widget_destroy(ggconv->window);
-	g_free(ggconv);
-}
-
 GaimConversationUiOps *gg_conv_get_ui_ops()
 {
 	return &conv_ui_ops;
@@ -536,8 +580,6 @@
 
 void gg_conversation_init()
 {
-	ggconvs = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, destroy_ggconv);
-
 	gaim_prefs_add_none(PREF_ROOT);
 	gaim_prefs_add_none(PREF_ROOT "/size");
 	gaim_prefs_add_int(PREF_ROOT "/size/width", 70);
@@ -586,7 +628,16 @@
 
 void gg_conversation_uninit()
 {
-	g_hash_table_destroy(ggconvs);
-	ggconvs = NULL;
 }
 
+void gg_conversation_set_active(GaimConversation *conv)
+{
+	GGConv *ggconv = conv->ui_data;
+
+	g_return_if_fail(ggconv);
+	g_return_if_fail(g_list_find(ggconv->list, conv));
+
+	ggconv->active_conv = conv;
+	gnt_screen_rename_widget(ggconv->window, gaim_conversation_get_title(conv));
+}
+

Modified: trunk/console/gntconv.h
===================================================================
--- trunk/console/gntconv.h	2006-08-31 03:13:54 UTC (rev 17093)
+++ trunk/console/gntconv.h	2006-08-31 04:39:21 UTC (rev 17094)
@@ -9,4 +9,7 @@
 
 void gg_conversation_uninit(void);
 
+/* Set a conversation as active in a contactized conversation */
+void gg_conversation_set_active(GaimConversation *conv);
+
 #endif

Modified: trunk/console/libgnt/gnt.h
===================================================================
--- trunk/console/libgnt/gnt.h	2006-08-31 03:13:54 UTC (rev 17093)
+++ trunk/console/libgnt/gnt.h	2006-08-31 04:39:21 UTC (rev 17094)
@@ -21,6 +21,8 @@
 
 void gnt_screen_move_widget(GntWidget *widget, int x, int y);
 
+void gnt_screen_rename_widget(GntWidget *widget, const char *text);
+
 gboolean gnt_widget_has_focus(GntWidget *widget);
 
 void gnt_widget_set_urgent(GntWidget *widget);

Modified: trunk/console/libgnt/gntbox.c
===================================================================
--- trunk/console/libgnt/gntbox.c	2006-08-31 03:13:54 UTC (rev 17093)
+++ trunk/console/libgnt/gntbox.c	2006-08-31 04:39:21 UTC (rev 17094)
@@ -41,6 +41,9 @@
 		gchar *title = g_strdup(box->title);
 		int pos = g_utf8_strlen(title, -1), right;
 
+		mvwhline(widget->window, 0, 1, ACS_HLINE | COLOR_PAIR(GNT_COLOR_NORMAL),
+				widget->priv.width - 2);
+
 		if (pos >= widget->priv.width - 4)
 		{
 			g_utf8_strncpy(title, box->title, widget->priv.width - 4);

Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-08-31 03:13:54 UTC (rev 17093)
+++ trunk/console/libgnt/gntmain.c	2006-08-31 04:39:21 UTC (rev 17094)
@@ -1188,3 +1188,10 @@
 	update_screen(NULL);
 }
 
+void gnt_screen_rename_widget(GntWidget *widget, const char *text)
+{
+	gnt_box_set_title(GNT_BOX(widget), text);
+	gnt_widget_draw(widget);
+	draw_taskbar(FALSE);
+}
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17093] trunk/console/libgnt

[<sa...@us...>]

Revision: 17093
          http://svn.sourceforge.net/gaim/?rev=17093&view=rev
Author:   sadrul
Date:     2006-08-30 20:13:54 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Allow different colors for highlighted windows. The name of the pair
is "urgent" if you want to change it from ~/.gntrc. The default is green
on the active background (or white). Red doesn't look too bad either.

Modified Paths:
--------------
    trunk/console/libgnt/gntcolors.c
    trunk/console/libgnt/gntcolors.h
    trunk/console/libgnt/gntmain.c

Modified: trunk/console/libgnt/gntcolors.c
===================================================================
--- trunk/console/libgnt/gntcolors.c	2006-08-31 03:12:07 UTC (rev 17092)
+++ trunk/console/libgnt/gntcolors.c	2006-08-31 03:13:54 UTC (rev 17093)
@@ -81,19 +81,22 @@
 		init_pair(GNT_COLOR_TEXT_NORMAL, GNT_COLOR_WHITE, GNT_COLOR_BLUE);
 		init_pair(GNT_COLOR_HIGHLIGHT_D, GNT_COLOR_BLACK, GNT_COLOR_GRAY);
 		init_pair(GNT_COLOR_DISABLED, GNT_COLOR_GRAY, GNT_COLOR_WHITE);
+		init_pair(GNT_COLOR_URGENT, GNT_COLOR_WHITE, GNT_COLOR_RED);
 	}
 	else
 	{
-		if (defaults == OK)
-		{
+		int bg;
+
+		if (defaults == OK) {
 			init_pair(GNT_COLOR_NORMAL, -1, -1);
-			init_pair(GNT_COLOR_DISABLED, COLOR_YELLOW, -1);
-		}
-		else
-		{
+			bg = -1;
+		} else {
 			init_pair(GNT_COLOR_NORMAL, COLOR_BLACK, COLOR_WHITE);
-			init_pair(GNT_COLOR_DISABLED, COLOR_YELLOW, COLOR_WHITE);
+			bg = COLOR_WHITE;
 		}
+		init_pair(GNT_COLOR_DISABLED, COLOR_YELLOW, bg);
+		init_pair(GNT_COLOR_URGENT, COLOR_GREEN, bg);
+
 		init_pair(GNT_COLOR_HIGHLIGHT, COLOR_WHITE, COLOR_BLUE);
 		init_pair(GNT_COLOR_SHADOW, COLOR_BLACK, COLOR_BLACK);
 		init_pair(GNT_COLOR_TITLE, COLOR_WHITE, COLOR_BLUE);
@@ -231,6 +234,8 @@
 				type = GNT_COLOR_TEXT_NORMAL;
 			else if (strcmp(key, "disabled") == 0)
 				type = GNT_COLOR_DISABLED;
+			else if (strcmp(key, "urgent") == 0)
+				type = GNT_COLOR_URGENT;
 			else
 				continue;
 

Modified: trunk/console/libgnt/gntcolors.h
===================================================================
--- trunk/console/libgnt/gntcolors.h	2006-08-31 03:12:07 UTC (rev 17092)
+++ trunk/console/libgnt/gntcolors.h	2006-08-31 03:13:54 UTC (rev 17093)
@@ -16,6 +16,7 @@
 	GNT_COLOR_SHADOW,
 	GNT_COLOR_TITLE,
 	GNT_COLOR_TITLE_D,
+	GNT_COLOR_URGENT,       /* this is for the 'urgent' windows */
 	GNT_COLORS
 } GntColorType;
 

Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-08-31 03:12:07 UTC (rev 17092)
+++ trunk/console/libgnt/gntmain.c	2006-08-31 03:13:54 UTC (rev 17093)
@@ -225,19 +225,14 @@
 		int color;
 		const char *title;
 
-		if (w == ordered->data)
-		{
+		if (w == ordered->data) {
 			/* This is the current window in focus */
 			color = GNT_COLOR_TITLE;
 			GNT_WIDGET_UNSET_FLAGS(w, GNT_WIDGET_URGENT);
-		}
-		else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_URGENT))
-		{
+		} else if (GNT_WIDGET_IS_FLAG_SET(w, GNT_WIDGET_URGENT)) {
 			/* This is a window with the URGENT hint set */
-			color = GNT_COLOR_TITLE_D;
-		}
-		else
-		{
+			color = GNT_COLOR_URGENT;
+		} else {
 			color = GNT_COLOR_NORMAL;
 		}
 		wbkgdset(taskbar, '\0' | COLOR_PAIR(color));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17092] trunk/gtk/plugins/notify.c

[<de...@us...>]

Revision: 17092
          http://svn.sourceforge.net/gaim/?rev=17092&view=rev
Author:   deryni9
Date:     2006-08-30 20:12:07 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
A long line fix, this is just so it doesn't get in my way in a minute.

Modified Paths:
--------------
    trunk/gtk/plugins/notify.c

Modified: trunk/gtk/plugins/notify.c
===================================================================
--- trunk/gtk/plugins/notify.c	2006-08-31 02:59:59 UTC (rev 17091)
+++ trunk/gtk/plugins/notify.c	2006-08-31 03:12:07 UTC (rev 17092)
@@ -599,7 +599,8 @@
 		GtkWidget *entry = g_object_get_data(G_OBJECT(widget), "title-entry");
 		gtk_widget_set_sensitive(entry, on);
 
-		gaim_prefs_set_string("/plugins/gtk/X11/notify/title_string", gtk_entry_get_text(GTK_ENTRY(entry)));
+		gaim_prefs_set_string("/plugins/gtk/X11/notify/title_string",
+		                      gtk_entry_get_text(GTK_ENTRY(entry)));
 	}
 
 	apply_method();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17091] trunk/console/gntblist.c

[<sa...@us...>]

Revision: 17091
          http://svn.sourceforge.net/gaim/?rev=17091&view=rev
Author:   sadrul
Date:     2006-08-30 19:59:59 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Update the contact when the status of the priority buddy changes.

Modified Paths:
--------------
    trunk/console/gntblist.c

Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c	2006-08-31 00:58:50 UTC (rev 17090)
+++ trunk/console/gntblist.c	2006-08-31 02:59:59 UTC (rev 17091)
@@ -123,22 +123,20 @@
 	if (list->ui_data == NULL)
 		return;
 
-	if (node->ui_data != NULL)
-	{
+	if (node->ui_data != NULL) {
 		gnt_tree_change_text(GNT_TREE(ggblist->tree), node,
 				0, get_display_name(node));
 	}
 
-	if (GAIM_BLIST_NODE_IS_BUDDY(node))
-	{
+	if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		GaimBuddy *buddy = (GaimBuddy*)node;
 		if (gaim_presence_is_online(gaim_buddy_get_presence(buddy)))
 			add_node((GaimBlistNode*)buddy, list->ui_data);
 		else
 			node_remove(gaim_get_blist(), node);
-	}
-	else if (GAIM_BLIST_NODE_IS_CHAT(node))
-	{
+
+		node_update(list, node->parent);
+	} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
 		add_chat((GaimChat *)node, list->ui_data);
 	}
 }
@@ -316,7 +314,7 @@
 	new_list,
 	new_node,
 	NULL,
-	node_update,		/* This doesn't do crap */
+	node_update,
 	node_remove,
 	NULL,
 	NULL,
@@ -426,7 +424,6 @@
 {
 	GaimGroup *group;
 	GaimBlistNode *node = (GaimBlistNode*)contact;
-	GaimBuddy *buddy;
 
 	if (node->ui_data)
 		return;
@@ -439,12 +436,6 @@
 				group, NULL);
 
 	gnt_tree_set_expanded(GNT_TREE(ggblist->tree), contact, FALSE);
-
-	buddy = gaim_contact_get_priority_buddy(contact);
-	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
-		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), contact, GNT_TEXT_FLAG_DIM);
-	else
-		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), contact, 0);
 }
 
 static void
@@ -462,10 +453,13 @@
 	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy,
 				gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)),
 				contact, NULL);
-	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
+	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy))) {
 		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, GNT_TEXT_FLAG_DIM);
-	else
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), contact, GNT_TEXT_FLAG_DIM);
+	} else {
 		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, 0);
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), contact, 0);
+	}
 }
 
 #if 0
@@ -529,8 +523,8 @@
 	if (action == NULL)
 		return;
 
-	gnt_tree_add_row_after(tree, action,
-			gnt_tree_create_row(tree, action->label), parent, NULL);
+	gnt_tree_add_row_last(tree, action,
+			gnt_tree_create_row(tree, action->label), parent);
 	for (list = action->children; list; list = list->next)
 		gnt_append_menu_action(tree, list->data, action);
 }
@@ -905,24 +899,19 @@
 	gnt_widget_set_name(context, "context menu");
 	g_signal_connect(G_OBJECT(context), "activate", G_CALLBACK(context_menu_callback), ggblist);
 
-	/* XXX: For now, for a contact, the context menu for the priority buddy will popup */
-	if (GAIM_BLIST_NODE_IS_CONTACT(node))
-		node = (GaimBlistNode*)gaim_contact_get_priority_buddy((GaimContact*)node);
-
-	if (GAIM_BLIST_NODE_IS_BUDDY(node))
-	{
+	if (GAIM_BLIST_NODE_IS_CONTACT(node)) {
+		create_buddy_menu(GNT_TREE(context),
+			gaim_contact_get_priority_buddy((GaimContact*)node));
+		title = g_strdup(gaim_contact_get_alias((GaimContact*)node));
+	} else if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		GaimBuddy *buddy = (GaimBuddy *)node;
 		create_buddy_menu(GNT_TREE(context), buddy);
 		title = g_strdup(gaim_buddy_get_name(buddy));
-	}
-	else if (GAIM_BLIST_NODE_IS_CHAT(node))
-	{
+	} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
 		GaimChat *chat = (GaimChat*)node;
 		create_chat_menu(GNT_TREE(context), chat);
 		title = g_strdup(gaim_chat_get_name(chat));
-	}
-	else if (GAIM_BLIST_NODE_IS_GROUP(node))
-	{
+	} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {
 		GaimGroup *group = (GaimGroup *)node;
 		create_group_menu(GNT_TREE(context), group);
 		title = g_strdup(group->name);
@@ -1038,6 +1027,7 @@
 			if (node == (GaimBlistNode*)pr || !GAIM_BUDDY_IS_ONLINE((GaimBuddy*)node))
 				continue;
 			str = g_string_append(str, "\n----------\n");
+			g_string_append_printf(str, _("Nickname: %s\n"), gaim_buddy_get_name((GaimBuddy*)node));
 			tooltip_for_buddy((GaimBuddy*)node, str);
 		}
 	} else if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
@@ -1136,14 +1126,23 @@
 static void
 update_buddy_display(GaimBuddy *buddy, GGBlist *ggblist)
 {
+	GaimContact *contact;
+	
+	contact = gaim_buddy_get_contact(buddy);
+
 	gnt_tree_change_text(GNT_TREE(ggblist->tree), buddy, 0, get_display_name((GaimBlistNode*)buddy));
+	gnt_tree_change_text(GNT_TREE(ggblist->tree), contact, 0, get_display_name((GaimBlistNode*)contact));
+
 	if (ggblist->tnode == (GaimBlistNode*)buddy)
 		draw_tooltip(ggblist);
 
-	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
+	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy))) {
 		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, GNT_TEXT_FLAG_DIM);
-	else
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), contact, GNT_TEXT_FLAG_DIM);
+	} else {
 		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, 0);
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), contact, 0);
+	}
 }
 
 static void
@@ -1444,9 +1443,14 @@
 			s2 = gaim_chat_get_name((GaimChat*)n2);
 			break;
 		case GAIM_BLIST_BUDDY_NODE:
-			s1 = gaim_buddy_get_alias((GaimBuddy*)n1);
-			s2 = gaim_buddy_get_alias((GaimBuddy*)n2);
+			/* XXX: reordering existing rows don't do well in GntTree */
+			return gaim_presence_compare(gaim_buddy_get_presence((GaimBuddy*)n1),
+					gaim_buddy_get_presence((GaimBuddy*)n2));
 			break;
+		case GAIM_BLIST_CONTACT_NODE:
+			s1 = gaim_contact_get_alias((GaimContact*)n1);
+			s2 = gaim_contact_get_alias((GaimContact*)n2);
+			break;
 		default:
 			return -1;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17090] trunk/console

[<sa...@us...>]

Revision: 17090
          http://svn.sourceforge.net/gaim/?rev=17090&view=rev
Author:   sadrul
Date:     2006-08-30 17:58:50 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Contactize the buddylist. But there's no way to move a buddy in some
contact yet. Drag-dropping might be possible, but I'll probably go
with a menuitem in the context-menu.

Modified Paths:
--------------
    trunk/console/gntblist.c
    trunk/console/libgnt/gnttree.c
    trunk/console/libgnt/gnttree.h

Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c	2006-08-30 23:29:42 UTC (rev 17089)
+++ trunk/console/gntblist.c	2006-08-31 00:58:50 UTC (rev 17090)
@@ -61,6 +61,7 @@
 GGBlist *ggblist;
 
 static void add_buddy(GaimBuddy *buddy, GGBlist *ggblist);
+static void add_contact(GaimContact *contact, GGBlist *ggblist);
 static void add_group(GaimGroup *group, GGBlist *ggblist);
 static void add_chat(GaimChat *chat, GGBlist *ggblist);
 static void add_node(GaimBlistNode *node, GGBlist *ggblist);
@@ -79,6 +80,8 @@
 {
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 		add_buddy((GaimBuddy*)node, ggblist);
+	else if (GAIM_BLIST_NODE_IS_CONTACT(node))
+		add_contact((GaimContact*)node, ggblist);
 	else if (GAIM_BLIST_NODE_IS_GROUP(node))
 		add_group((GaimGroup*)node, ggblist);
 	else if (GAIM_BLIST_NODE_IS_CHAT(node))
@@ -107,9 +110,9 @@
 
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 	{
-		GaimGroup *group = gaim_buddy_get_group((GaimBuddy*)node);
-		if (gaim_blist_get_group_online_count(group) == 0)
-			node_remove(list, (GaimBlistNode*)group);
+		GaimContact *contact = (GaimContact*)node->parent;
+		if (contact->online < 1)
+			node_remove(list, (GaimBlistNode*)contact);
 	}
 	draw_tooltip(ggblist);
 }
@@ -348,6 +351,12 @@
 	char status[8] = " ";
 	const char *name = NULL;
 
+	if (GAIM_BLIST_NODE_IS_CONTACT(node))
+		node = (GaimBlistNode*)gaim_contact_get_priority_buddy((GaimContact*)node);  /* XXX: this can return NULL?! */
+	
+	if (node == NULL)
+		return NULL;
+
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 	{
 		GaimBuddy *buddy = (GaimBuddy *)node;
@@ -413,20 +422,46 @@
 }
 
 static void
+add_contact(GaimContact *contact, GGBlist *ggblist)
+{
+	GaimGroup *group;
+	GaimBlistNode *node = (GaimBlistNode*)contact;
+	GaimBuddy *buddy;
+
+	if (node->ui_data)
+		return;
+	
+	group = (GaimGroup*)node->parent;
+	add_node((GaimBlistNode*)group, ggblist);
+
+	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), contact,
+				gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)),
+				group, NULL);
+
+	gnt_tree_set_expanded(GNT_TREE(ggblist->tree), contact, FALSE);
+
+	buddy = gaim_contact_get_priority_buddy(contact);
+	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), contact, GNT_TEXT_FLAG_DIM);
+	else
+		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), contact, 0);
+}
+
+static void
 add_buddy(GaimBuddy *buddy, GGBlist *ggblist)
 {
-	GaimGroup *group;
+	GaimContact *contact;
 	GaimBlistNode *node = (GaimBlistNode *)buddy;
 	if (node->ui_data)
 		return;
 
-	group = gaim_buddy_get_group(buddy);
-	add_node((GaimBlistNode*)group, ggblist);
+	contact = (GaimContact*)node->parent;
+	add_node((GaimBlistNode*)contact, ggblist);
 
 	gnt_tree_remove(GNT_TREE(ggblist->tree), buddy);
 	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy,
 				gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)),
-				group, NULL);
+				contact, NULL);
 	if (gaim_presence_is_idle(gaim_buddy_get_presence(buddy)))
 		gnt_tree_set_row_flags(GNT_TREE(ggblist->tree), buddy, GNT_TEXT_FLAG_DIM);
 	else
@@ -460,6 +495,9 @@
 
 	if (!node)
 		return;
+	
+	if (GAIM_BLIST_NODE_IS_CONTACT(node))
+		node = (GaimBlistNode*)gaim_contact_get_priority_buddy((GaimContact*)node);
 
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 	{
@@ -713,7 +751,9 @@
 	if (name && !*name)
 		name = NULL;
 
-	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	if (GAIM_BLIST_NODE_IS_CONTACT(node))
+		gaim_blist_alias_contact((GaimContact*)node, name);
+	else if (GAIM_BLIST_NODE_IS_BUDDY(node))
 		gaim_blist_alias_buddy((GaimBuddy*)node, name);
 	else if (GAIM_BLIST_NODE_IS_CHAT(node))
 		gaim_blist_alias_chat((GaimChat*)node, name);
@@ -729,7 +769,9 @@
 	const char *name = NULL;
 	char *prompt;
 
-	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	if (GAIM_BLIST_NODE_IS_CONTACT(node))
+		name = gaim_contact_get_alias((GaimContact*)node);
+	else if (GAIM_BLIST_NODE_IS_BUDDY(node))
 		name = gaim_buddy_get_contact_alias((GaimBuddy*)node);
 	else if (GAIM_BLIST_NODE_IS_CHAT(node))
 		name = gaim_chat_get_name((GaimChat*)node);
@@ -788,19 +830,16 @@
 static void
 gg_blist_remove_node(GaimBlistNode *node)
 {
-	if (GAIM_BLIST_NODE_IS_BUDDY(node))
-	{
+	if (GAIM_BLIST_NODE_IS_CONTACT(node)) {
+		gaim_blist_remove_contact((GaimContact*)node);
+	} else if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		GaimBuddy *buddy = (GaimBuddy*)node;
 		GaimGroup *group = gaim_buddy_get_group(buddy);
 		gaim_account_remove_buddy(gaim_buddy_get_account(buddy), buddy, group);
 		gaim_blist_remove_buddy(buddy);
-	}
-	else if (GAIM_BLIST_NODE_IS_CHAT(node))
-	{
+	} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
 		gaim_blist_remove_chat((GaimChat*)node);
-	}
-	else if (GAIM_BLIST_NODE_IS_GROUP(node))
-	{
+	} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {
 		remove_group((GaimGroup*)node);
 	}
 }
@@ -811,7 +850,10 @@
 	char *primary;
 	const char *name, *sec = NULL;
 
-	if (GAIM_BLIST_NODE_IS_BUDDY(node))
+	/* XXX: could be a contact */
+	if (GAIM_BLIST_NODE_IS_CONTACT(node))
+		name = gaim_contact_get_alias((GaimContact*)node);
+	else if (GAIM_BLIST_NODE_IS_BUDDY(node))
 		name = gaim_buddy_get_name((GaimBuddy*)node);
 	else if (GAIM_BLIST_NODE_IS_CHAT(node))
 		name = gaim_chat_get_name((GaimChat*)node);
@@ -863,6 +905,10 @@
 	gnt_widget_set_name(context, "context menu");
 	g_signal_connect(G_OBJECT(context), "activate", G_CALLBACK(context_menu_callback), ggblist);
 
+	/* XXX: For now, for a contact, the context menu for the priority buddy will popup */
+	if (GAIM_BLIST_NODE_IS_CONTACT(node))
+		node = (GaimBlistNode*)gaim_contact_get_priority_buddy((GaimContact*)node);
+
 	if (GAIM_BLIST_NODE_IS_BUDDY(node))
 	{
 		GaimBuddy *buddy = (GaimBuddy *)node;
@@ -912,14 +958,52 @@
 }
 
 static void
+tooltip_for_buddy(GaimBuddy *buddy, GString *str)
+{
+	GaimPlugin *prpl;
+	GaimPluginProtocolInfo *prpl_info;
+	GaimAccount *account;
+
+	account = gaim_buddy_get_account(buddy);
+	
+	g_string_append_printf(str, _("Account: %s (%s)"),
+			gaim_account_get_username(account),
+			gaim_account_get_protocol_name(account));
+	
+	prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
+	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
+	if (prpl_info && prpl_info->tooltip_text) {
+		GString *tip = g_string_new("");
+		char *strip, *br;
+		prpl_info->tooltip_text(buddy, tip, TRUE);
+
+		br = gaim_strreplace(tip->str, "\n", "<br>");
+		strip = gaim_markup_strip_html(br);
+		g_string_append(str, strip);
+		g_string_free(tip, TRUE);
+		g_free(strip);
+		g_free(br);
+	}
+
+	if (gaim_prefs_get_bool("/gaim/gnt/blist/idletime")) {
+		GaimPresence *pre = gaim_buddy_get_presence(buddy);
+		if (gaim_presence_is_idle(pre)) {
+			time_t idle = gaim_presence_get_idle_time(pre);
+			if (idle > 0) {
+				char *st = gaim_str_seconds_to_string(time(NULL) - idle);
+				g_string_append_printf(str, _("\nIdle: %s"), st);
+				g_free(st);
+			}
+		}
+	}
+}
+
+static void
 draw_tooltip(GGBlist *ggblist)
 {
 	GaimBlistNode *node;
 	int x, y, top, width;
 	GString *str;
-	GaimPlugin *prpl;
-	GaimPluginProtocolInfo *prpl_info;
-	GaimAccount *account;
 	GntTree *tree;
 	GntWidget *widget, *box;
 	char *title = NULL;
@@ -946,49 +1030,21 @@
 
 	str = g_string_new("");
 
-	if (GAIM_BLIST_NODE_IS_BUDDY(node))
-	{
+	if (GAIM_BLIST_NODE_IS_CONTACT(node)) {
+		GaimBuddy *pr = gaim_contact_get_priority_buddy((GaimContact*)node);
+		title = g_strdup(gaim_contact_get_alias((GaimContact*)node));
+		tooltip_for_buddy(pr, str);
+		for (node = node->child; node; node = node->next) {
+			if (node == (GaimBlistNode*)pr || !GAIM_BUDDY_IS_ONLINE((GaimBuddy*)node))
+				continue;
+			str = g_string_append(str, "\n----------\n");
+			tooltip_for_buddy((GaimBuddy*)node, str);
+		}
+	} else if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
 		GaimBuddy *buddy = (GaimBuddy *)node;
-		account = gaim_buddy_get_account(buddy);
-		
-		g_string_append_printf(str, _("Account: %s (%s)"),
-				gaim_account_get_username(account),
-				gaim_account_get_protocol_name(account));
-		
-		prpl = gaim_find_prpl(gaim_account_get_protocol_id(account));
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(prpl);
-		if (prpl_info && prpl_info->tooltip_text)
-		{
-			GString *tip = g_string_new("");
-			char *strip, *br;
-			prpl_info->tooltip_text(buddy, tip, TRUE);
-
-			br = gaim_strreplace(tip->str, "\n", "<br>");
-			strip = gaim_markup_strip_html(br);
-			g_string_append(str, strip);
-			g_string_free(tip, TRUE);
-			g_free(strip);
-			g_free(br);
-		}
-
-		if (gaim_prefs_get_bool("/gaim/gnt/blist/idletime"))
-		{
-			GaimPresence *pre = gaim_buddy_get_presence(buddy);
-			if (gaim_presence_is_idle(pre))
-			{
-				time_t idle = gaim_presence_get_idle_time(pre);
-				if (idle > 0) {
-					char *st = gaim_str_seconds_to_string(time(NULL) - idle);
-					g_string_append_printf(str, _("\nIdle: %s"), st);
-					g_free(st);
-				}
-			}
-		}
-
+		tooltip_for_buddy(buddy, str);
 		title = g_strdup(gaim_buddy_get_name(buddy));
-	}
-	else if (GAIM_BLIST_NODE_IS_GROUP(node))
-	{
+	} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {
 		GaimGroup *group = (GaimGroup *)node;
 
 		g_string_append_printf(str, _("Online: %d\nTotal: %d"),
@@ -996,9 +1052,7 @@
 						gaim_blist_get_group_size(group, FALSE));
 
 		title = g_strdup(group->name);
-	}
-	else if (GAIM_BLIST_NODE_IS_CHAT(node))
-	{
+	} else if (GAIM_BLIST_NODE_IS_CHAT(node)) {
 		GaimChat *chat = (GaimChat *)node;
 		GaimAccount *account = chat->account;
 
@@ -1007,9 +1061,7 @@
 				gaim_account_get_protocol_name(account));
 
 		title = g_strdup(gaim_chat_get_name(chat));
-	}
-	else
-	{
+	} else {
 		g_string_free(str, TRUE);
 		return;
 	}

Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c	2006-08-30 23:29:42 UTC (rev 17089)
+++ trunk/console/libgnt/gnttree.c	2006-08-31 00:58:50 UTC (rev 17090)
@@ -111,7 +111,7 @@
 
 	while(row->next)
 		row = row->next;
-	if (row->child)
+	if (!row->collapsed && row->child)
 		row = get_last_child(row->child);
 	return row;
 }
@@ -1215,3 +1215,12 @@
 	tree->compare = func;
 }
 
+void gnt_tree_set_expanded(GntTree *tree, void *key, gboolean expanded)
+{
+	GntTreeRow *row = g_hash_table_lookup(tree->hash, key);
+	if (row) {
+		row->collapsed = !expanded;
+		if (GNT_WIDGET(tree)->window)
+			gnt_widget_draw(GNT_WIDGET(tree));
+	}
+}

Modified: trunk/console/libgnt/gnttree.h
===================================================================
--- trunk/console/libgnt/gnttree.h	2006-08-30 23:29:42 UTC (rev 17089)
+++ trunk/console/libgnt/gnttree.h	2006-08-31 00:58:50 UTC (rev 17090)
@@ -118,6 +118,8 @@
 
 void gnt_tree_set_compare_func(GntTree *tree, GCompareFunc func);
 
+void gnt_tree_set_expanded(GntTree *tree, void *key, gboolean expanded);
+
 G_END_DECLS
 
 #endif /* GNT_TREE_H */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17089] trunk/console/libgnt

[<sa...@us...>]

Revision: 17089
          http://svn.sourceforge.net/gaim/?rev=17089&view=rev
Author:   sadrul
Date:     2006-08-30 16:29:42 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
This is a little better than before. But resizing the width of a textview
with a large buffer still takes too much time.

Modified Paths:
--------------
    trunk/console/libgnt/gnt.pc.in
    trunk/console/libgnt/gnttextview.c
    trunk/console/libgnt/gnttextview.h

Modified: trunk/console/libgnt/gnt.pc.in
===================================================================
--- trunk/console/libgnt/gnt.pc.in	2006-08-30 17:33:44 UTC (rev 17088)
+++ trunk/console/libgnt/gnt.pc.in	2006-08-30 23:29:42 UTC (rev 17089)
@@ -10,4 +10,4 @@
 Version: @VERSION@
 Requires: glib-2.0
 Cflags: -I${includedir}/gnt
-Libs: -L${libdir} -lgnt -lncursesw
+Libs: -L${libdir} -lgnt

Modified: trunk/console/libgnt/gnttextview.c
===================================================================
--- trunk/console/libgnt/gnttextview.c	2006-08-30 17:33:44 UTC (rev 17088)
+++ trunk/console/libgnt/gnttextview.c	2006-08-30 23:29:42 UTC (rev 17089)
@@ -10,7 +10,8 @@
 {
 	GntTextFormatFlags tvflag;
 	chtype flags;
-	char *text;
+	int start;
+	int end;     /* This is the next byte of the last character of this segment */
 } GntTextSegment;
 
 typedef struct
@@ -43,10 +44,14 @@
 		for (iter = line->segments; iter; iter = iter->next)
 		{
 			GntTextSegment *seg = iter->data;
+			char *end = view->string->str + seg->end;
+			char back = *end;
+			*end = '\0';
 			wattrset(widget->window, seg->flags);
-			wprintw(widget->window, "%s", seg->text);
+			wprintw(widget->window, "%s", (view->string->str + seg->start));
 			if (!iter->next)
 				whline(widget->window, ' ' | seg->flags, widget->priv.width - line->length - 1);
+			*end = back;
 		}
 	}
 
@@ -115,7 +120,6 @@
 free_text_segment(gpointer data, gpointer null)
 {
 	GntTextSegment *seg = data;
-	g_free(seg->text);
 	g_free(seg);
 }
 
@@ -135,6 +139,7 @@
 	view->list = g_list_first(view->list);
 	g_list_foreach(view->list, free_text_line, NULL);
 	g_list_free(view->list);
+	g_string_free(view->string, TRUE);
 }
 
 static gboolean
@@ -155,6 +160,7 @@
 	/* This is pretty ugly, and inefficient. Someone do something about it. */
 	GntTextLine *line;
 	GList *back, *iter, *list;
+	GString *string;
 	int pos = 0;
 
 	list = view->list;
@@ -167,19 +173,30 @@
 
 	back = g_list_last(view->list);
 	view->list = NULL;
+
+	string = view->string;
+	view->string = NULL;
 	gnt_text_view_clear(view);
 
+	view->string = g_string_set_size(view->string, string->len);
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(view), GNT_WIDGET_DRAWING);
+
 	for (; back; back = back->prev) {
 		line = back->data;
-
-		if (back->next && !line->soft)
-			gnt_text_view_next_line(view);
-
+		if (back->next && !line->soft) {
+			GList *llist = g_list_first(view->list);
+			llist = g_list_prepend(llist, g_new0(GntTextLine, 1));
+		}
+		
 		for (iter = line->segments; iter; iter = iter->next) {
 			GntTextSegment *seg = iter->data;
-			gnt_text_view_append_text_with_flags(view, seg->text, seg->tvflag);
+			char *start = string->str + seg->start;
+			char *end = string->str + seg->end;
+			char back = *end;
+			*end = '\0';
+			gnt_text_view_append_text_with_flags(view, start, seg->tvflag);
+			*end = back;
 		}
-
 		free_text_line(line, NULL);
 	}
 	g_list_free(list);
@@ -191,7 +208,9 @@
 		list = list->next;
 	}
 	view->list = list;
+	GNT_WIDGET_UNSET_FLAGS(GNT_WIDGET(view), GNT_WIDGET_DRAWING);
 	gnt_widget_draw(GNT_WIDGET(view));
+	g_string_free(string, TRUE);
 }
 
 static void
@@ -267,6 +286,7 @@
 
 	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
 
+	view->string = g_string_new(NULL);
 	view->list = g_list_append(view->list, line);
 
 	return widget;
@@ -276,61 +296,53 @@
 {
 	GntWidget *widget = GNT_WIDGET(view);
 	int fl = 0;
-	char **split;
-	int i;
+	const char *start, *end;
 	GList *list = view->list;
+	GntTextLine *line;
+	int len;
 
 	if (text == NULL || *text == '\0')
 		return;
 
 	fl = gnt_text_format_flag_to_chtype(flags);
 
+	len = view->string->len;
+	g_string_append(view->string, text);
+
 	view->list = g_list_first(view->list);
 
-	split = g_strsplit(text, "\n", -1);
-	for (i = 0; split[i]; i++)
-	{
-		GntTextLine *line;
-		char *iter = split[i];
-		int prev = 0;
+	start = end = view->string->str + len;
 
-		if (i)
-		{
-			line = g_new0(GntTextLine, 1);
-			view->list = g_list_prepend(g_list_first(view->list), line);
+	while (*start) {
+		GntTextSegment *seg;
+
+		if (*end == '\n' || *end == '\r') {
+			end++;
+			start = end;
+			gnt_text_view_next_line(view);
+			continue;
 		}
 
 		line = view->list->data;
+		end = gnt_util_onscreen_width_to_pointer(start,
+				widget->priv.width - line->length - 1, &len);
 
-		while (iter && *iter)
-		{
-			int len;
+		seg = g_new0(GntTextSegment, 1);
+		seg->start = start - view->string->str;
+		seg->end = end - view->string->str;
+		seg->tvflag = flags;
+		seg->flags = fl;
+		line->segments = g_list_append(line->segments, seg);
+		line->length += len;
 
-			len = gnt_util_onscreen_width_to_pointer(iter, widget->priv.width - line->length - 1, &prev) - iter;
-			if (len) {
-				GntTextSegment *seg = g_new0(GntTextSegment, 1);
-				seg->flags = fl;
-				seg->tvflag = flags;
-				seg->text = g_new0(char, len + 1);
-				g_utf8_strncpy(seg->text, iter, g_utf8_pointer_to_offset(iter, iter + len));
-				line->segments = g_list_append(line->segments, seg);
-
-				line->length += prev;
-				iter += len;
-				if (line->length >= widget->priv.width - 1 && *iter) {
-					line = g_new0(GntTextLine, 1);
-					line->soft = TRUE;
-					view->list = g_list_prepend(g_list_first(view->list), line);
-				}
-			} else {
-				line = g_new0(GntTextLine, 1);
-				line->soft = TRUE;
-				view->list = g_list_prepend(g_list_first(view->list), line);
-			}
+		start = end;
+		if (*end && *end != '\n' && *end != '\r') {
+			line = g_new0(GntTextLine, 1);
+			line->soft = TRUE;
+			view->list = g_list_prepend(view->list, line);
 		}
 	}
 
-	g_strfreev(split);
 	view->list = list;
 
 	gnt_widget_draw(widget);
@@ -401,6 +413,9 @@
 
 	line = g_new0(GntTextLine, 1);
 	view->list = g_list_append(view->list, line);
+	if (view->string)
+		g_string_free(view->string, TRUE);
+	view->string = g_string_new(NULL);
 
 	if (GNT_WIDGET(view)->window)
 		gnt_widget_draw(GNT_WIDGET(view));

Modified: trunk/console/libgnt/gnttextview.h
===================================================================
--- trunk/console/libgnt/gnttextview.h	2006-08-30 17:33:44 UTC (rev 17088)
+++ trunk/console/libgnt/gnttextview.h	2006-08-30 23:29:42 UTC (rev 17089)
@@ -25,6 +25,7 @@
 {
 	GntWidget parent;
 
+	GString *string;
 	GList *list;        /* List of GntTextLine */
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17088] trunk/console/libgnt

[<sa...@us...>]

Revision: 17088
          http://svn.sourceforge.net/gaim/?rev=17088&view=rev
Author:   sadrul
Date:     2006-08-30 10:33:44 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
PLUGINS don't need to be defined for WMs.

Modified Paths:
--------------
    trunk/console/libgnt/configure.ac
    trunk/console/libgnt/wms/Makefile.am

Modified: trunk/console/libgnt/configure.ac
===================================================================
--- trunk/console/libgnt/configure.ac	2006-08-30 17:09:44 UTC (rev 17087)
+++ trunk/console/libgnt/configure.ac	2006-08-30 17:33:44 UTC (rev 17088)
@@ -205,5 +205,6 @@
 
 AC_OUTPUT([Makefile
            gnt.pc
+           wms/Makefile
 		  ])
 

Modified: trunk/console/libgnt/wms/Makefile.am
===================================================================
--- trunk/console/libgnt/wms/Makefile.am	2006-08-30 17:09:44 UTC (rev 17087)
+++ trunk/console/libgnt/wms/Makefile.am	2006-08-30 17:33:44 UTC (rev 17088)
@@ -1,7 +1,5 @@
 s_la_LDFLAGS             = -module -avoid-version $(GLIB_LIBS)
 
-if PLUGINS
-
 plugin_LTLIBRARIES = \
 	s.la
 
@@ -9,8 +7,6 @@
 
 s_la_SOURCES             = s.c
 
-endif # PLUGINS
-
 EXTRA_DIST = 
 
 AM_CPPFLAGS = \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17087] trunk/console/libgnt/gntmain.c

[<sa...@us...>]

Revision: 17087
          http://svn.sourceforge.net/gaim/?rev=17087&view=rev
Author:   sadrul
Date:     2006-08-30 10:09:44 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
Do stuff with SIGCHLD

Modified Paths:
--------------
    trunk/console/libgnt/gntmain.c

Modified: trunk/console/libgnt/gntmain.c
===================================================================
--- trunk/console/libgnt/gntmain.c	2006-08-30 06:26:40 UTC (rev 17086)
+++ trunk/console/libgnt/gntmain.c	2006-08-30 17:09:44 UTC (rev 17087)
@@ -21,7 +21,11 @@
 #include <signal.h>
 #include <string.h>
 #include <ctype.h>
+#include <errno.h>
 
+#include <sys/types.h>
+#include <sys/wait.h>
+
 /**
  * Notes: Interesting functions to look at:
  * 	scr_dump, scr_init, scr_restore: for workspaces
@@ -882,21 +886,42 @@
 	return FALSE;
 }
 
-#ifdef SIGWINCH
+/* Xerox */
 static void
+clean_pid(void)
+{
+	int status;
+	pid_t pid;
+
+	do {
+		pid = waitpid(-1, &status, WNOHANG);
+	} while (pid != 0 && pid != (pid_t)-1);
+
+	if ((pid == (pid_t) - 1) && (errno != ECHILD)) {
+		char errmsg[BUFSIZ];
+		snprintf(errmsg, BUFSIZ, "Warning: waitpid() returned %d", pid);
+		perror(errmsg);
+	}
+}
+
+static void
 sighandler(int sig)
 {
-	if (sig == SIGWINCH)
-	{
+	switch (sig) {
+#ifdef SIGWINCH
+	case SIGWINCH:
 		werase(stdscr);
 		wrefresh(stdscr);
-
 		g_idle_add(refresh_screen, NULL);
+		signal(SIGWINCH, sighandler);
+		break;
+#endif
+	case SIGCHLD:
+		clean_pid();
+		signal(SIGCHLD, sighandler);
+		break;
 	}
-
-	signal(SIGWINCH, sighandler);
 }
-#endif
 
 static void
 init_wm()
@@ -910,7 +935,7 @@
 	handle = g_module_open(name, G_MODULE_BIND_LAZY);
 	if (handle) {
 		gboolean (*init)(GntWM *);
-		if (g_module_symbol(handle, "gntwm_init", &init)) {
+		if (g_module_symbol(handle, "gntwm_init", (gpointer)&init)) {
 			init(&wm);
 		}
 	}
@@ -983,6 +1008,7 @@
 #ifdef SIGWINCH
 	signal(SIGWINCH, sighandler);
 #endif
+	signal(SIGCHLD, sighandler);
 
 	g_type_init();
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17086] trunk/doc

[<rl...@us...>]

Revision: 17086
Author:   rlaager
Date:     2006-08-29 23:26:40 -0700 (Tue, 29 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17086&view=rev

Log Message:
-----------
I noticed the gntgaim man page didn't list all the protocols... I've synced the man page summaries with the gtkgaim about box. Maybe that sucks, but at least everything is consistent now.

Modified Paths:
--------------
    trunk/doc/gaim.1.in
    trunk/doc/gntgaim.1.in
Modified: trunk/doc/gaim.1.in
===================================================================
--- trunk/doc/gaim.1.in	2006-08-30 05:07:43 UTC (rev 17085)
+++ trunk/doc/gaim.1.in	2006-08-30 06:26:40 UTC (rev 17086)
@@ -28,9 +28,9 @@
 
 .SH DESCRIPTION
 .PP
-\fBgaim\fR is a GTK2-based Instant Messaging (IM) application.  It supports
-multiple protocols via modules, including AIM, ICQ, Yahoo!, MSN, Jabber,
-IRC, Gadu-Gadu and Zephyr.  It has many common features found in
+\fBgaim\fR is a gtk2-based modular messaging client capable of using
+AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime,
+Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in
 other clients, as well as many unique features.  Gaim is not endorsed by or
 affiliated with America Online, ICQ, Microsoft, or Yahoo.
 

Modified: trunk/doc/gntgaim.1.in
===================================================================
--- trunk/doc/gntgaim.1.in	2006-08-30 05:07:43 UTC (rev 17085)
+++ trunk/doc/gntgaim.1.in	2006-08-30 06:26:40 UTC (rev 17086)
@@ -28,11 +28,11 @@
 
 .SH DESCRIPTION
 .PP
-\fBgntgaim\fR is a console-based frontend for Instant Messaging (IM)
-application Gaim.  It supports multiple protocols via modules, including AIM,
-ICQ, Yahoo!, MSN, Jabber, IRC, Gadu-Gadu and Zephyr.  It has many
-common features found in other clients, as well as many unique features.  Gaim
-is not endorsed by or affiliated with America Online, ICQ, Microsoft, or Yahoo.
+\fBgntgaim\fR is a console-based modular messaging client capable of using
+AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime,
+Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in
+other clients, as well as many unique features.  Gaim is not endorsed by or
+affiliated with America Online, ICQ, Microsoft, or Yahoo.
 
 .SH OPTIONS
 The following options are provided by \fBgntgaim\fR using the standard GNU


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17085] trunk/console

[<sa...@us...>]

Revision: 17085
Author:   sadrul
Date:     2006-08-29 22:07:43 -0700 (Tue, 29 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17085&view=rev

Log Message:
-----------
Parts of Richard Nelson (wabz)'s patch:
Emit the selection-changed signal when you wheel-scroll.
Show the idle-time only when it has an appropriate idle-time.

Modified Paths:
--------------
    trunk/console/gntblist.c
    trunk/console/libgnt/gnttree.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c	2006-08-30 04:19:14 UTC (rev 17084)
+++ trunk/console/gntblist.c	2006-08-30 05:07:43 UTC (rev 17085)
@@ -977,9 +977,11 @@
 			if (gaim_presence_is_idle(pre))
 			{
 				time_t idle = gaim_presence_get_idle_time(pre);
-				char *st = gaim_str_seconds_to_string(time(NULL) - idle);
-				g_string_append_printf(str, _("\nIdle: %s"), st);
-				g_free(st);
+				if (idle > 0) {
+					char *st = gaim_str_seconds_to_string(time(NULL) - idle);
+					g_string_append_printf(str, _("\nIdle: %s"), st);
+					g_free(st);
+				}
 			}
 		}
 

Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c	2006-08-30 04:19:14 UTC (rev 17084)
+++ trunk/console/libgnt/gnttree.c	2006-08-30 05:07:43 UTC (rev 17085)
@@ -614,6 +614,8 @@
 static gboolean
 gnt_tree_clicked(GntWidget *widget, GntMouseEvent event, int x, int y)
 {
+	GntTree *tree = GNT_TREE(widget);
+	GntTreeRow *old = tree->current;
 	if (event == GNT_MOUSE_SCROLL_UP) {
 		action_up(GNT_TREE(widget));
 	} else if (event == GNT_MOUSE_SCROLL_DOWN) {
@@ -645,6 +647,9 @@
 	} else {
 		return FALSE;
 	}
+	if (old != tree->current) {
+		tree_selection_changed(tree, old, tree->current);
+	}
 	return TRUE;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17084] trunk/libgaim/plugins/perl/scripts/request.pl

[<dat...@us...>]

Revision: 17084
Author:   datallah
Date:     2006-08-29 21:19:14 -0700 (Tue, 29 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17084&view=rev

Log Message:
-----------
Updated to work with current Perl loader API

Modified Paths:
--------------
    trunk/libgaim/plugins/perl/scripts/request.pl
Modified: trunk/libgaim/plugins/perl/scripts/request.pl
===================================================================
--- trunk/libgaim/plugins/perl/scripts/request.pl	2006-08-30 03:46:34 UTC (rev 17083)
+++ trunk/libgaim/plugins/perl/scripts/request.pl	2006-08-30 04:19:14 UTC (rev 17084)
@@ -3,107 +3,118 @@
 use Gaim;
 
 # All the information Gaim gets about our nifty plugin
-%PLUGIN_INFO = ( 
-	perl_api_version => 2, 
-	name => " Perl: $MODULE_NAME", 
-	version => "0.1", 
-	summary => "Test plugin for the Perl interpreter.", 
-	description => "Implements a set of test proccedures to ensure all functions that work in the C API still work in the Perl plugin interface.  As XSUBs are added, this *should* be updated to test the changes.  Furthermore, this will function as the tutorial perl plugin.", 
-	author => "John H. Kelm <johnhkelm\@gmail.com>", 
-	url => "http://sourceforge.net/users/johnhkelm/", 
-	
-	load => "plugin_load", 
-	unload => "plugin_unload", 
-	plugin_action => "plugin_action_test",
-	plugin_action_label => "Plugin Action Test Label"
-); 
+%PLUGIN_INFO = (
+	perl_api_version => 2,
+	name => " Perl: $MODULE_NAME",
+	version => "0.1",
+	summary => "Test plugin for the Perl interpreter.",
+	description => "Implements a set of test proccedures to ensure all functions that work in the C API still work in the Perl plugin interface.  As XSUBs are added, this *should* be updated to test the changes.  Furthermore, this will function as the tutorial perl plugin.",
+	author => "John H. Kelm <johnhkelm\@gmail.com>",
+	url => "http://sourceforge.net/users/johnhkelm/",
 
+	load => "plugin_load",
+	unload => "plugin_unload",
+	plugin_action_sub => "plugin_action_names"
+);
 
+
 	# These names must already exist
 	my $GROUP		= "UIUC Buddies";
 	my $USERNAME 		= "johnhkelm2";
-	
+
 	# We will create these on load then destroy them on unload
 	my $TEST_GROUP		= "perlTestGroup";
 	my $TEST_NAME	 	= "perlTestName";
 	my $TEST_ALIAS	 	= "perlTestAlias";
 	my $PROTOCOL_ID 	= "prpl-oscar";
 
+%plugin_actions = (
+	"Plugin Action Test Label" => \&plugin_action_test,
+);
 
-sub plugin_init { 
-	return %PLUGIN_INFO; 
-} 
+sub plugin_action_names {
+	foreach $key (keys %plugin_actions) {
+		push @array, $key;
+	}
 
-sub ok_cb_test{
+	return @array;
+}
+
+sub plugin_init {
+	return %PLUGIN_INFO;
+}
+
+sub ok_cb_test {
 	$fields = shift;
-	print "ok_cb_test: BEGIN\n";
-	print "ok_cb_test: Button Click\n";
-	print "ok_cb_test: Field Type: " . $fields . "\n";
-	$account = Gaim::Request::fields_get_account($fields, "acct_test");
-	print "ok_cb_test: Username of selected account: " . Gaim::Account::get_username($account) . "\n";
-	$int = Gaim::Request::fields_get_integer($fields, "int_test");
-	print "ok_cb_test: Integer Value:" . $int . "\n";
-	$choice = Gaim::Request::fields_get_choice($fields, "ch_test");
-	print "ok_cb_test: Choice Value:" . $choice . "\n";
-	print "ok_cb_test: END\n";
+
+	Gaim::Debug::info($MODULE_NAME, "plugin_action_cb_test: BEGIN\n");
+	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: BEGIN\n");
+	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Button Click\n");
+	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Field Type:  $fields \n");
+	$account = Gaim::Request::Fields::get_account($fields, "acct_test");
+	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Username of selected account: " . Gaim::Account::get_username($account) . "\n");
+	$int = Gaim::Request::Fields::get_integer($fields, "int_test");
+	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Integer Value: $int \n");
+	$choice = Gaim::Request::Fields::get_choice($fields, "ch_test");
+	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: Choice Value: $choice \n");
+	Gaim::Debug::info($MODULE_NAME, "ok_cb_test: END\n");
 }
 
-sub cancel_cb_test{
-	print "cancel_cb_test: Button Click\n";
+sub cancel_cb_test {
+	Gaim::Debug::info($MODULE_NAME, "cancel_cb_test: Button Click\n");
 }
 
 sub plugin_action_test {
 	$plugin = shift;
-	print "plugin_action_cb_test: BEGIN\n";
+	Gaim::Debug::info($MODULE_NAME, "plugin_action_cb_test: BEGIN\n");
 	plugin_request($plugin);
-	print "plugin_action_cb_test: END\n";
+	Gaim::Debug::info($MODULE_NAME, "plugin_action_cb_test: END\n");
 }
 
-sub plugin_load { 
-	my $plugin = shift; 
+sub plugin_load {
+	my $plugin = shift;
 	#########  TEST CODE HERE  ##########
-	
 
+
 }
 
-sub plugin_request {	
-	$group = Gaim::Request::field_group_new("Group Name");
-	$field = Gaim::Request::field_account_new("acct_test", "Account Text", undef);
-	Gaim::Request::field_account_set_show_all($field, 0);
-	Gaim::Request::field_group_add_field($group, $field);
-	
-	$field = Gaim::Request::field_int_new("int_test", "Integer Text", 33);
-	Gaim::Request::field_group_add_field($group, $field);
-	
+sub plugin_request {
+	$group = Gaim::Request::Field::Group::new("Group Name");
+	$field = Gaim::Request::Field::account_new("acct_test", "Account Text", undef);
+	Gaim::Request::Field::account_set_show_all($field, 0);
+	Gaim::Request::Field::Group::add_field($group, $field);
+
+	$field = Gaim::Request::Field::int_new("int_test", "Integer Text", 33);
+	Gaim::Request::Field::Group::add_field($group, $field);
+
 	# Test field choice
-	$field = Gaim::Request::field_choice_new("ch_test", "Choice Text", 1);
-	Gaim::Request::field_choice_add($field, "Choice 0");
-	Gaim::Request::field_choice_add($field, "Choice 1");
-	Gaim::Request::field_choice_add($field, "Choice 2");
-	
-	Gaim::Request::field_group_add_field($group, $field);
-	
-	
-	$request = Gaim::Request::fields_new();
-	Gaim::Request::fields_add_group($request, $group);
-	
+	$field = Gaim::Request::Field::choice_new("ch_test", "Choice Text", 1);
+	Gaim::Request::Field::choice_add($field, "Choice 0");
+	Gaim::Request::Field::choice_add($field, "Choice 1");
+	Gaim::Request::Field::choice_add($field, "Choice 2");
+
+	Gaim::Request::Field::Group::add_field($group, $field);
+
+
+	$request = Gaim::Request::Fields::new();
+	Gaim::Request::Fields::add_group($request, $group);
+
 	Gaim::Request::fields(
-		$plugin, 
-		"Request Title!", 
-		"Primary Title", 
+		$plugin,
+		"Request Title!",
+		"Primary Title",
 		"Secondary Title",
 		$request,
 		"Ok Text", "ok_cb_test",
 		"Cancel Text", "cancel_cb_test");
-} 
+}
 
-sub plugin_unload { 
-	my $plugin = shift; 
-	print "#" x 80 . "\n";
+sub plugin_unload {
+	my $plugin = shift;
+	Gaim::Debug::info($MODULE_NAME, "#" x 80 . "\n");
 	#########  TEST CODE HERE  ##########
-	
-	
 
-	print "\n" . "#" x 80 . "\n";
+
+	Gaim::Debug::info($MODULE_NAME, "\n" . "#" x 80 . "\n");
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17083] trunk/gaim-installer.nsi

[<dat...@us...>]

Revision: 17083
Author:   datallah
Date:     2006-08-29 20:46:34 -0700 (Tue, 29 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17083&view=rev

Log Message:
-----------
Installer cleanup - use NSIS built-in stuff instead of writing our own

Modified Paths:
--------------
    trunk/gaim-installer.nsi
Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi	2006-08-30 02:40:56 UTC (rev 17082)
+++ trunk/gaim-installer.nsi	2006-08-30 03:46:34 UTC (rev 17083)
@@ -10,7 +10,6 @@
 Var name
 Var GTK_FOLDER
 Var GTK_THEME_SEL
-Var LANG_IS_SET
 Var ISSILENT
 Var STARTUP_RUN_KEY
 Var SPELLCHECK_SEL
@@ -40,7 +39,12 @@
 
 !include "MUI.nsh"
 !include "Sections.nsh"
+!include "FileFunc.nsh"
 
+!insertmacro GetParameters
+!insertmacro GetOptions
+!insertmacro GetParent
+
 ;--------------------------------
 ;Defines
 
@@ -937,9 +941,7 @@
   Loop:
     IfFileExists $0 dir_exists
     StrCpy $1 $0 ; save last
-    Push $0
-    Call GetParent
-    Pop $0
+    ${GetParent} $0 $0
     StrLen $2 $0
     ; IfFileExists "C:" on xp returns true and on win2k returns false
     ; So we're done in such a case..
@@ -1002,35 +1004,6 @@
   Pop $0
 FunctionEnd
 
-; GetParent
-; input, top of stack  (e.g. C:\Program Files\Poop)
-; output, top of stack (replaces, with e.g. C:\Program Files)
-; modifies no other variables.
-;
-; Usage:
-;   Push "C:\Program Files\Directory\Whatever"
-;   Call GetParent
-;   Pop $R0
-;   ; at this point $R0 will equal "C:\Program Files\Directory"
-Function GetParent
-   Exch $0 ; old $0 is on top of stack
-   Push $1
-   Push $2
-   StrCpy $1 -1
-   loop:
-     StrCpy $2 $0 1 $1
-     StrCmp $2 "" exit
-     StrCmp $2 "\" exit
-     IntOp $1 $1 - 1
-   Goto loop
-   exit:
-     StrCpy $0 $0 $1
-     Pop $2
-     Pop $1
-     Exch $0 ; put $0 on top of stack, restore $0 to original value
-FunctionEnd
-
-
 ; CheckGtkVersion
 ; inputs: Push 2 GTK+ version strings to check. The major value needs to
 ; be equal and the minor value needs to be greater or equal.
@@ -1221,10 +1194,12 @@
       StrCpy $ISSILENT "/S"
   set_gtk_normal:
 
-  Call ParseParameters
+  ${GetParameters} $R0
+  ClearErrors
+  ${GetOptions} $R0 "/L=" $LANGUAGE
+  IfErrors 0 skip_lang
 
   ; Select Language
-  IntCmp $LANG_IS_SET 1 skip_lang
     ; Display Language selection dialog
     !insertmacro MUI_LANGDLL_DISPLAY
     skip_lang:
@@ -1250,9 +1225,8 @@
     Goto instdir_done
   user_dir:
     Push $SMPROGRAMS
-    Call GetParent
-    Call GetParent
-    Pop $R2
+    ${GetParent} $SMPROGRAMS $R2
+    ${GetParent} $R2 $R2
     StrCpy $INSTDIR "$R2\Gaim"
 
   instdir_done:
@@ -1381,11 +1355,8 @@
     no_gtk_cont:
       ; Suggest path..
       StrCmp $R1 "HKCU" 0 hklm1
-        StrCpy $R0 "$SMPROGRAMS"
-        Push $R0
-        Call GetParent
-        Call GetParent
-        Pop $R0
+        ${GetParent} $SMPROGRAMS $R0
+        ${GetParent} $R0 $R0
         StrCpy $R0 "$R0\GTK\2.0"
         Goto got_path
       hklm1:
@@ -1412,112 +1383,6 @@
 FunctionEnd
 !endif
 
-; GetParameters
-; input, none
-; output, top of stack (replaces, with e.g. whatever)
-; modifies no other variables.
-Function GetParameters
-
-   Push $R0
-   Push $R1
-   Push $R2
-   Push $R3
-
-   StrCpy $R2 1
-   StrLen $R3 $CMDLINE
-
-   ;Check for quote or space
-   StrCpy $R0 $CMDLINE $R2
-   StrCmp $R0 '"' 0 +3
-     StrCpy $R1 '"'
-     Goto loop
-   StrCpy $R1 " "
-
-   loop:
-     IntOp $R2 $R2 + 1
-     StrCpy $R0 $CMDLINE 1 $R2
-     StrCmp $R0 $R1 get
-     StrCmp $R2 $R3 get
-     Goto loop
-
-   get:
-     IntOp $R2 $R2 + 1
-     StrCpy $R0 $CMDLINE 1 $R2
-     StrCmp $R0 " " get
-     StrCpy $R0 $CMDLINE "" $R2
-
-   Pop $R3
-   Pop $R2
-   Pop $R1
-   Exch $R0
-
-FunctionEnd
-
- ; StrStr
- ; input, top of stack = string to search for
- ;        top of stack-1 = string to search in
- ; output, top of stack (replaces with the portion of the string remaining)
- ; modifies no other variables.
- ;
- ; Usage:
- ;   Push "this is a long ass string"
- ;   Push "ass"
- ;   Call StrStr
- ;   Pop $R0
- ;  ($R0 at this point is "ass string")
-
-Function StrStr
-   Exch $R1 ; st=haystack,old$R1, $R1=needle
-   Exch    ; st=old$R1,haystack
-   Exch $R2 ; st=old$R1,old$R2, $R2=haystack
-   Push $R3
-   Push $R4
-   Push $R5
-   StrLen $R3 $R1
-   StrCpy $R4 0
-   ; $R1=needle
-   ; $R2=haystack
-   ; $R3=len(needle)
-   ; $R4=cnt
-   ; $R5=tmp
-   loop:
-     StrCpy $R5 $R2 $R3 $R4
-     StrCmp $R5 $R1 done
-     StrCmp $R5 "" done
-     IntOp $R4 $R4 + 1
-     Goto loop
-   done:
-   StrCpy $R1 $R2 "" $R4
-   Pop $R5
-   Pop $R4
-   Pop $R3
-   Pop $R2
-   Exch $R1
-FunctionEnd
-
-;
-; Parse the Command line
-;
-; Unattended install command line parameters
-; /L=Language e.g.: /L=1033
-;
-Function ParseParameters
-  Push $R0
-  IntOp $LANG_IS_SET 0 + 0
-  Call GetParameters
-  ;Pop $R0
-  ;Push $R0
-  Push "L="
-  Call StrStr
-  Pop $R0
-  StrCmp $R0 "" next
-  StrCpy $R0 $R0 4 2 ; Strip first 2 chars of string
-  StrCpy $LANGUAGE $R0
-  IntOp $LANG_IS_SET 0 + 1
-  next:
-  Pop $R0
-FunctionEnd
-
 ; GetWindowsVersion
 ;
 ; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17082] trunk

[<dat...@us...>]

Revision: 17082
Author:   datallah
Date:     2006-08-29 19:40:56 -0700 (Tue, 29 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17082&view=rev

Log Message:
-----------
It really isn't smart for us to blow away the previous install directory (we do ask nicely, but it still isn't good) if the uninstaller for the previous version fails, so now we offer the choice between "continue regardless" or "cancel installing".
It would really be ideal if we could get these translations done through gettext or something.

Modified Paths:
--------------
    trunk/gaim-installer.nsi
    trunk/gtk/win32/nsis/langmacros.nsh
    trunk/gtk/win32/nsis/translations/albanian.nsh
    trunk/gtk/win32/nsis/translations/bulgarian.nsh
    trunk/gtk/win32/nsis/translations/catalan.nsh
    trunk/gtk/win32/nsis/translations/czech.nsh
    trunk/gtk/win32/nsis/translations/danish.nsh
    trunk/gtk/win32/nsis/translations/dutch.nsh
    trunk/gtk/win32/nsis/translations/english.nsh
    trunk/gtk/win32/nsis/translations/finnish.nsh
    trunk/gtk/win32/nsis/translations/french.nsh
    trunk/gtk/win32/nsis/translations/galician.nsh
    trunk/gtk/win32/nsis/translations/german.nsh
    trunk/gtk/win32/nsis/translations/hebrew.nsh
    trunk/gtk/win32/nsis/translations/hungarian.nsh
    trunk/gtk/win32/nsis/translations/italian.nsh
    trunk/gtk/win32/nsis/translations/japanese.nsh
    trunk/gtk/win32/nsis/translations/korean.nsh
    trunk/gtk/win32/nsis/translations/kurdish.nsh
    trunk/gtk/win32/nsis/translations/lithuanian.nsh
    trunk/gtk/win32/nsis/translations/norwegian.nsh
    trunk/gtk/win32/nsis/translations/polish.nsh
    trunk/gtk/win32/nsis/translations/portuguese-br.nsh
    trunk/gtk/win32/nsis/translations/portuguese.nsh
    trunk/gtk/win32/nsis/translations/romanian.nsh
    trunk/gtk/win32/nsis/translations/russian.nsh
    trunk/gtk/win32/nsis/translations/serbian-latin.nsh
    trunk/gtk/win32/nsis/translations/simp-chinese.nsh
    trunk/gtk/win32/nsis/translations/slovak.nsh
    trunk/gtk/win32/nsis/translations/slovenian.nsh
    trunk/gtk/win32/nsis/translations/spanish.nsh
    trunk/gtk/win32/nsis/translations/swedish.nsh
    trunk/gtk/win32/nsis/translations/trad-chinese.nsh
    trunk/gtk/win32/nsis/translations/valencian.nsh
    trunk/gtk/win32/nsis/translations/vietnamese.nsh
Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gaim-installer.nsi	2006-08-30 02:40:56 UTC (rev 17082)
@@ -224,6 +224,7 @@
   IfErrors +3
   StrCpy $STARTUP_RUN_KEY "HKCU"
   Goto +4
+  ClearErrors
   ReadRegStr $STARTUP_RUN_KEY HKLM "${GAIM_STARTUP_RUN_KEY}" "Gaim"
   IfErrors +2
   StrCpy $STARTUP_RUN_KEY "HKLM"
@@ -269,26 +270,9 @@
               Goto uninstall_problem
 
         uninstall_problem:
-          ; In this case just wipe out previous Gaim install dir..
-          ; We get here because versions 0.60a1 and 0.60a2 don't have versions set in the registry
-          ; and versions 0.60 and lower did not correctly set the uninstall reg string
-          ; (the string was set in quotes)
-          IfSilent do_wipeout
-          MessageBox MB_YESNO $(GAIM_PROMPT_WIPEOUT) IDYES do_wipeout IDNO cancel_install
-          cancel_install:
-            Quit
-
-          do_wipeout:
-            StrCmp $R0 "HKLM" gaim_del_lm_reg gaim_del_cu_reg
-            gaim_del_cu_reg:
-              DeleteRegKey HKCU ${GAIM_REG_KEY}
-              Goto uninstall_prob_cont
-            gaim_del_lm_reg:
-              DeleteRegKey HKLM ${GAIM_REG_KEY}
-
-            uninstall_prob_cont:
-              RMDir /r "$R1"
-
+          ; We can't uninstall.  Either the user must manually uninstall or we ignore and reinstall over it.
+          MessageBox MB_OKCANCEL $(GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL) /SD IDOK IDOK done
+          Quit
   done:
 SectionEnd
 
@@ -327,9 +311,7 @@
 
   upgrade_gtk:
     StrCpy $GTK_FOLDER $R6
-    IfSilent skip_mb
-    MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) IDNO done
-    skip_mb:
+    MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
     ClearErrors
     ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT'
     Goto gtk_install_cont
@@ -341,9 +323,7 @@
 
     gtk_install_error:
       Delete "$TEMP\gtk-runtime.exe"
-      IfSilent skip_mb1
-      MessageBox MB_OK $(GTK_INSTALL_ERROR) IDOK
-      skip_mb1:
+      MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK
       Quit
 
   have_gtk:
@@ -771,15 +751,11 @@
     Goto done
 
   cant_uninstall:
-    IfSilent skip_mb
-    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_1) IDOK
-    skip_mb:
+    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_1) /SD IDOK
     Quit
 
   no_rights:
-    IfSilent skip_mb1
-    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_2) IDOK
-    skip_mb1:
+    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_2) /SD IDOK
     Quit
 
   done:
@@ -901,9 +877,7 @@
       Goto done
 
     no_rights:
-      IfSilent skip_mb
-      MessageBox MB_OK $(GTK_NO_THEME_INSTALL_RIGHTS) IDOK
-      skip_mb:
+      MessageBox MB_OK $(GTK_NO_THEME_INSTALL_RIGHTS) /SD IDOK
       StrCpy $1 ""
 
     done:
@@ -1209,7 +1183,7 @@
   Push $R0
   System::Call 'kernel32::OpenMutex(i 2031617, b 0, t "gaim_is_running") i .R0'
   IntCmp $R0 0 done
-  MessageBox MB_OK|MB_ICONEXCLAMATION $(GAIM_IS_RUNNING) IDOK
+  MessageBox MB_OK|MB_ICONEXCLAMATION $(GAIM_IS_RUNNING) /SD IDOK
     Abort
   done:
   Pop $R0
@@ -1223,7 +1197,7 @@
   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "gaim_installer_running") i .r1 ?e'
   Pop $R0
   StrCmp $R0 0 +3
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(INSTALLER_IS_RUNNING)
+    MessageBox MB_OK|MB_ICONEXCLAMATION $(INSTALLER_IS_RUNNING) /SD IDOK
     Abort
   Call RunCheck
   StrCpy $name "Gaim ${GAIM_VERSION}"
@@ -1263,6 +1237,7 @@
   ReadRegStr $INSTDIR HKCU "${GAIM_REG_KEY}" ""
   IfErrors +2
   StrCmp $INSTDIR "" 0 instdir_done
+  ClearErrors
   ReadRegStr $INSTDIR HKLM "${GAIM_REG_KEY}" ""
   IfErrors +2
   StrCmp $INSTDIR "" 0 instdir_done
@@ -1375,9 +1350,7 @@
 
     StrCmp $R0 "0" have_gtk need_gtk
     need_gtk:
-      IfSilent skip_mb
-      MessageBox MB_OK $(GTK_INSTALLER_NEEDED) IDOK
-      skip_mb:
+      MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK
       Quit
     have_gtk:
     Pop $R0
@@ -1432,9 +1405,7 @@
   Call VerifyDir
   Pop $R0
   StrCmp $R0 "0" 0 done
-    IfSilent skip_mb
-    MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) IDOK
-    skip_mb:
+    MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) /SD IDOK
     Abort
   done:
   Pop $R0
@@ -1768,7 +1739,7 @@
     Pop $R1
     StrCmp $R1 "" +3
     StrCmp $R1 "cancel" done
-    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_ERROR) : $R1" IDRETRY retry IDCANCEL done
+    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_ERROR) : $R1" /SD IDCANCEL IDRETRY retry IDCANCEL done
 
   retry_dict:
     Push $R0
@@ -1776,7 +1747,7 @@
     Pop $R1
     StrCmp $R1 "" +3
     StrCmp $R1 "cancel" done
-    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_DICT_ERROR) : $R1" IDRETRY retry_dict
+    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_DICT_ERROR) : $R1" /SD IDCANCEL IDRETRY retry_dict
 
   done:
 

Modified: trunk/gtk/win32/nsis/langmacros.nsh
===================================================================
--- trunk/gtk/win32/nsis/langmacros.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/langmacros.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -29,9 +29,9 @@
   ; String labels should match those from the default language file.
 
   ; Startup checks
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_IS_RUNNING				${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALLER_NEEDED			${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_IS_RUNNING			${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALLER_NEEDED		${CUR_LANG}
 
   ; License Page
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_LICENSE_BUTTON			${CUR_LANG}
@@ -67,12 +67,11 @@
 
   ; Gaim Section Prompts and Texts
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_UNINSTALL_DESC			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_PROMPT_WIPEOUT			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_PROMPT_DIR_EXISTS		${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL	${CUR_LANG}
 
   ; GTK+ Section Prompts
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH			${CUR_LANG}
+  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH		${CUR_LANG}
 
   ; GTK+ Themes section
   !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NO_THEME_INSTALL_RIGHTS		${CUR_LANG}

Modified: trunk/gtk/win32/nsis/translations/albanian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/albanian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/albanian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (vetëm hiq)"
-!define GAIM_PROMPT_WIPEOUT			"Është gati për t'u fshirë drejtoria juaj e vjetër Gaim. Doni të vazhdohet?$\r$\rShënim: Do të fshihet çfarëdo shtojceë jo standarde që mund të keni instaluar.$\rNuk do të preken rregullime Gaim përdoruesash."
-!define GAIM_PROMPT_DIR_EXISTS		"Drejtoria e instalimit që treguat ekziston tashmë. Çfarëdo përmbajtje$\rdo të fshihet. Do të donit të vazhdohet?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"gabim gjatë instalimit të GTK+ runtime."

Modified: trunk/gtk/win32/nsis/translations/bulgarian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/bulgarian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/bulgarian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -32,8 +32,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (\xF1\xE0\xEC\xEE \xEF\xF0\xE5\xEC\xE0\xF5\xE2\xE0\xED\xE5)"
-!define GAIM_PROMPT_WIPEOUT			"\xC2\xE0\xF8\xE0\xF2\xE0 \xF1\xF2\xE0\xF0\xE0 Gaim \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF \xF9\xE5 \xE1\xFA\xE4\xE5 \xE8\xE7\xF2\xF0\xE8\xF2\xE0. \xC8\xF1\xEA\xE0\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xE4\xFA\xEB\xE6\xE8\xF2\xE5?$\r$\r\xC7\xE0\xE1\xE5\xEB\xE5\xE6\xEA\xE0: \xC2\xF1\xE8\xF7\xEA\xE8 \xED\xE5\xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xE8 \xE4\xEE\xE1\xE0\xE2\xEA\xE8 \xEA\xEE\xE8\xF2\xEE \xF1\xF2\xE5 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xEB\xE8 \xF9\xE5 \xE1\xFA\xE4\xE0\xF2 \xE8\xE7\xF2\xF0\xE8\xF2\xE8.$\r\xCD\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8\xF2\xE5 \xED\xE0 Gaim \xED\xFF\xEC\xE0 \xE4\xE0 \xE1\xFA\xE4\xE0\xF2 \xEF\xEE\xE2\xEB\xE8\xFF\xED\xE8."
-!define GAIM_PROMPT_DIR_EXISTS		"\xC4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF\xF2\xE0 \xEA\xEE\xFF\xF2\xEE \xE8\xE7\xE1\xF0\xE0\xF5\xF2\xE5 \xF1\xFA\xF9\xE5\xF1\xF2\xE2\xF3\xE2\xE0. \xC2\xF1\xE8\xF7\xEA\xEE \xEA\xEE\xE5\xF2\xEE \xE5 \xE2 \xED\xE5\xFF$\r\xF9\xE5 \xE1\xFA\xE4\xE5 \xE8\xE7\xF2\xF0\xE8\xF2\xEE. \xC6\xE5\xEB\xE0\xE5\xF2\xE5 \xEB\xE8 \xE4\xE0 \xEF\xF0\xEE\xE4\xFA\xEB\xE6\xE8\xF2\xE5?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"\xC3\xF0\xE5\xF8\xEA\xE0 \xEF\xF0\xE8 \xE8\xED\xF1\xF2\xE0\xEB\xE8\xF0\xE0\xED\xE5 \xED\xE0 GTK+ runtime."

Modified: trunk/gtk/win32/nsis/translations/catalan.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/catalan.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/catalan.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -49,8 +49,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (nom\xE9s esborrar)"
-!define GAIM_PROMPT_WIPEOUT			"El teu directori antic de Gaim ser\xE0 esborrat. Vols continuar?$\r$\rNota: Els plugins no est\xE0ndards que tinguis instal.lats seran esborrats.$\rLes prefer\xE8ncies d'usuari de Gaim no es veruan afectades."
-!define GAIM_PROMPT_DIR_EXISTS			"El directori d'instal.laci\xF3 que has especificat ja existeix. Tots els continguts$\rseran esborrats. Vols continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execuci\xF3 GTK+."

Modified: trunk/gtk/win32/nsis/translations/czech.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/czech.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/czech.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (odinstalovat)"
-!define GAIM_PROMPT_WIPEOUT			"V\xE1\x9A star\xFD adres\xE1\xF8 pro Gaim bude vymaz\xE1n. Chcete pokra\xE8ovat?$\r$\rUpozorn\xECn\xED: Jak\xE1koli nestandardn\xED roz\x9A\xED\xF8en\xED (plugin) , kter\xE1 m\xE1te nainstalov\xE1na budou ztracena.$\rU\x9Eivatelsk\xE1 nastaven\xED pro Gaim budou zachov\xE1na."
-!define GAIM_PROMPT_DIR_EXISTS		"Adres\xE1\xF8 kter\xFD byl zad\xE1n pro instalaci ji\x9E existuje. Ve\x9Aker\xFD obsah$\rbude smaz\xE1n. Chcete pokra\xE8ovat?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba p\xF8i instalaci GTK+ runtime."

Modified: trunk/gtk/win32/nsis/translations/danish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/danish.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/danish.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (fjern)"
-!define GAIM_PROMPT_WIPEOUT			"Din gamle Gaim folder vil blive slettet. \xD8nsker du at forts\xE6tte? $\r$\rNB: Alle ikke-standard plugins du m\xE5tte have installeret vil blive slettet.$\rGaim brugerindstillinger vil ikke blive p\xE5virket af dette."
-!define GAIM_PROMPT_DIR_EXISTS		"Den \xF8nskede installationsfolder eksisterer allerede. Ethvert indhold$\ri folderen vil blive slettet. \xD8nsker du at forts\xE6tte?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fejl under installeringen af GTK+ runtime."

Modified: trunk/gtk/win32/nsis/translations/dutch.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/dutch.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/dutch.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -42,8 +42,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (alleen verwijderen)"
-!define GAIM_PROMPT_WIPEOUT			"Uw oude Gaim map staat op het punt om verwijderd te worden. Wilt u doorgaan?$\r$\rLet op: Alle door uzelf ge\xEFnstalleerde plugins zullen ook verwijderd worden.$\rDe gebruikersinstellingen van Gaim worden niet aangeraakt."
-!define GAIM_PROMPT_DIR_EXISTS		"De gegeven installatiemap bestaat al. Eventuele inhoud zal verwijderd worden. Wilt u doorgaan?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."

Modified: trunk/gtk/win32/nsis/translations/english.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/english.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/english.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -13,34 +13,34 @@
 
 ; Startup Checks
 !insertmacro GAIM_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING			"The installer is already running."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING			"An instance of Gaim is currently running. Exit Gaim and then try again."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING				"An instance of Gaim is currently running. Exit Gaim and then try again."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_VERSION} or higher of the GTK+ runtime"
 
 ; License Page
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BUTTON			"Next >"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BOTTOM_TEXT			"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
 
 ; Components Page
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (required)"
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_TITLE			"GTK+ Runtime Environment (required)"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_TITLE		"GTK+ Themes"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_TITLE			"GTK+ Themes"
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NOTHEME_SECTION_TITLE		"No Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_SECTION_TITLE		"Wimp Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_SECTION_TITLE	"Bluecurve Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_TITLE "Shortcuts"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Start Menu"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_DESCRIPTION		"Core Gaim files and dlls"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Gaim"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes can change the look and feel of GTK+ applications."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_SECTION_TITLE			"Wimp Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_SECTION_TITLE		"Light House Blue Theme"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_TITLE		"Shortcuts"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menu"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_DESCRIPTION			"Core Gaim files and dlls"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION			"A multi-platform GUI toolkit, used by Gaim"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION		"GTK+ Themes can change the look and feel of GTK+ applications."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_DESC			"Don't install a GTK+ theme"
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC		"The Bluecurve theme."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue theme."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Shortcuts for starting Gaim"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_DESC   "Create a shortcut to Gaim on the Desktop"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_DESC   "Create a Start Menu entry for Gaim"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC			"The Bluecurve theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC		"The Lighthouseblue theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Shortcuts for starting Gaim"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_DESC		"Create a shortcut to Gaim on the Desktop"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_DESC		"Create a Start Menu entry for Gaim"
 
 ; GTK+ Directory Page
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT			"An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: Gaim may not work unless you do."
@@ -50,15 +50,14 @@
 
 ; Gaim Section Prompts and Texts
 !insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_UNINSTALL_DESC			"Gaim (remove only)"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_WIPEOUT			"Your old Gaim directory is about to be deleted. Would you like to continue?$\r$\rNote: Any non-standard plugins that you may have installed will be deleted.$\rGaim user settings will not be affected."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_DIR_EXISTS		"The installation directory you specified already exists. Any contents$\rwill be deleted. Would you like to continue?"
+!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Unable to uninstall the currently installed version of Gaim. The new version will be installed without removing the currently installed version."
 
 ; GTK+ Section Prompts
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALL_ERROR			"Error installing GTK+ runtime."
 !insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."
 
 ; GTK+ Themes section
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_INSTALL_RIGHTS	"You do not have permission to install a GTK+ theme."
+!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_INSTALL_RIGHTS		"You do not have permission to install a GTK+ theme."
 
 ; Uninstall Section Prompts
 !insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for Gaim.$\rIt is likely that another user installed this application."

Modified: trunk/gtk/win32/nsis/translations/finnish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/finnish.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/finnish.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (vain poisto)"
-!define GAIM_PROMPT_WIPEOUT			"Vanha Gaim-hakemistosi poistetaan. Tahdotko jatkaa?$\r$\rHuomio: Jokainen j\xE4lkeenp\xE4in asennettu lis\xE4osa poistetaan.$\rGaimin k\xE4ytt\xE4j\xE4asetuksissa ei tapahdu muutoksia."
-!define GAIM_PROMPT_DIR_EXISTS		"Antamasti hakemisto on jo olemassa. Kaikki tiedot poistetaan $\r. Tahdotko jatkaa?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Virhe asennettaessa GTK+ runtime."

Modified: trunk/gtk/win32/nsis/translations/french.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/french.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/french.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -51,8 +51,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (supprimer uniquement)"
-!define GAIM_PROMPT_WIPEOUT			"L'ancien dossier de Gaim va \xEAtre supprim\xE9. Voulez-vous continuer ?$\r$\rNote : Tous les plugins non standards que vous avez install\xE9s seront aussi supprim\xE9s.$\rLes configurations et les comptes utilisateurs de Gaim ne sont pas touch\xE9s."
-!define GAIM_PROMPT_DIR_EXISTS			"Le dossier d'installation que vous avez choisi existe d\xE9j\xE0. Son contenu sera effac\xE9.$\rVoulez-vous continuer ?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erreur lors de l'installation des biblioth\xE8ques GTK+"

Modified: trunk/gtk/win32/nsis/translations/galician.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/galician.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/galician.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (s\xF3lo eliminar)"
-!define GAIM_PROMPT_WIPEOUT			"O seu directorio antigo de Gaim vai ser borrado. \xBFDesexa continuar?$\r$\rObservaci\xF3n: calquer aplique non est\xE1ndar que puidera haber instalado borrarase.$\rIsto non afectar\xE1 \xE1s s\xFAas preferencias de usuario en Gaim."
-!define GAIM_PROMPT_DIR_EXISTS		"O directorio de instalaci\xF3n que especificou xa existe. Todos os contidos$\rser\xE1n borrados. \xBFDesexa continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o executable GTK+."

Modified: trunk/gtk/win32/nsis/translations/german.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/german.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/german.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -48,8 +48,6 @@
  
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (nur entfernen)"
-!define GAIM_PROMPT_WIPEOUT			"Ihre altes Gaim-Verzeichnis soll gel\xF6scht werden. M\xF6chten Sie fortfahren?$\r$\rHinweis: Alle nicht-Standard Plugins, die Sie evtl. installiert haben werden$\rgel\xF6scht. Gaim-Benutzereinstellungen sind nicht betroffen."
-!define GAIM_PROMPT_DIR_EXISTS		"Das Installationsverzeichnis, das Sie angegeben haben, existiert schon. Der Verzeichnisinhalt$\rwird gel\xF6scht. M\xF6chten Sie fortfahren?"
  
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."

Modified: trunk/gtk/win32/nsis/translations/hebrew.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/hebrew.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/hebrew.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"GAIM (\xEE\xE7\xE9\xF7\xE4 \xE1\xEC\xE1\xE3)"
-!define GAIM_PROMPT_WIPEOUT			"?\xE4\xE9\xF9\xF0\xE4 \xE4\xE5\xEC\xEB\xFA \xEC\xE4\xE9\xEE\xE7\xF7. \xEC\xE4\xEE\xF9\xE9\xEA GAIM \xFA\xE9\xF7\xE9\xE9\xFA$\r$\rNote: \xE4\xF2\xF8\xE4: \xFA\xE5\xF1\xF4\xE5\xFA \xEC\xE0 \xF8\xE2\xE9\xEC\xE5\xFA \xE9\xEE\xE7\xF7\xE5.$\r.\xE4\xE2\xE3\xF8\xE5\xFA \xE4\xEE\xF9\xFA\xEE\xF9 \xEC\xE0 \xE9\xF9\xFA\xF0\xE5"
-!define GAIM_PROMPT_DIR_EXISTS		"\xFA\xE9\xF7\xE9\xE9\xFA \xE4\xE4\xFA\xF7\xF0\xE4 \xEB\xE1\xF8 \xF7\xE9\xE9\xEE\xFA. \xEB\xEC \xEE\xF9\xE1\xFA\xE5\xEB\xE4 $\r?\xE9\xEE\xE7\xF7. \xEC\xE4\xEE\xF9\xE9\xEA"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			".GTK+ \xF9\xE2\xE9\xE0\xE4 \xE1\xE4\xFA\xF7\xF0\xFA \xF1\xE1\xE9\xE1\xFA"

Modified: trunk/gtk/win32/nsis/translations/hungarian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/hungarian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/hungarian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (csak elt\xE1vol\xEDt\xE1s)"
-!define GAIM_PROMPT_WIPEOUT			"Az \xD6n kor\xE1bbi Gaim k\xF6nyvt\xE1ra t\xF6r\xF6lve lesz. Folytatni szeretn\xE9?$\r$\rMegjegyz\xE9s: Minden \xD6n \xE1ltal telep\xEDtett bov\xEDtm\xE9ny t\xF6r\xF6lve lesz.$\rA Gaim felhaszn\xE1l\xF3i be\xE1ll\xEDt\xE1sokra ez nincs hat\xE1ssal."
-!define GAIM_PROMPT_DIR_EXISTS			"A megadott telep\xEDt\xE9si k\xF6nyvt\xE1r m\xE1r l\xE9tezik. A tartalma t\xF6r\xF6lve lesz.$\rFolytatni szeretn\xE9?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Hiba a GTK+ futtat\xF3k\xF6rnyezet telep\xEDt\xE9se k\xF6zben."

Modified: trunk/gtk/win32/nsis/translations/italian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/italian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/italian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (solo rimozione)"
-!define GAIM_PROMPT_WIPEOUT			"La tua vecchia directory di Gaim sta per essere cancellata. Vuoi andare avanti?$\r$\rNota: Tutti i plugin non standard che hai installato saranno cancellati.$\rLe impostazioni di Gaim non saranno rimosse."
-!define GAIM_PROMPT_DIR_EXISTS		"La directory di installazione specificata esiste gi\xE0. Tutto il contenuto$\rverr\xE0 cancellato. Vuoi continuare?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."

Modified: trunk/gtk/win32/nsis/translations/japanese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/japanese.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/japanese.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -48,8 +48,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (\x8D폜\x82̂\xDD)"
-!define GAIM_PROMPT_WIPEOUT			"\x8CÂ\xA2Gaim\x82̃t\x83H\x83\x8B\x83_\x82̍폜\x82Ɋւ\xB5\x82āB\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9?$\r$\r\x92\x8D\x88\xD3: \x82\xA0\x82Ȃ\xBD\x82̃C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB5\x82\xBD\x82\xB7\x82ׂĂ̔\xF1\x95W\x8F\x80\x82ȃv\x83\x89\x83O\x83C\x83\x93\x82͍폜\x82\xB3\x82\xEA\x82܂\xB7\x81B$\rGaim\x82̐ݒ\xE8\x82͉e\x8B\xBF\x82\xF0\x8E󂯂܂\xB9\x82\xF1\x81B"
-!define GAIM_PROMPT_DIR_EXISTS			"\x82\xA0\x82Ȃ\xBD\x82̎w\x92肵\x82\xBD\x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x90\xE6\x82̃t\x83H\x83\x8B\x83_\x82͂\xB7\x82łɑ\xB6\x8D݂\xB5\x82Ă\xA2\x82܂\xB7\x81B\x93\xE0\x97e\x82͂\xB7\x82ׂ\xC4$\r\x8D폜\x82\xB3\x82\xEA\x82܂\xB7\x81B\x91\xB1\x8Ds\x82\xB5\x82܂\xB7\x82\xA9?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+\x83\x89\x83\x93\x83^\x83C\x83\x80\x82̃C\x83\x93\x83X\x83g\x81[\x83\x8B\x82ŃG\x83\x89\x81[\x82\xAA\x94\xAD\x90\xB6\x82\xB5\x82܂\xB5\x82\xBD\x81B"

Modified: trunk/gtk/win32/nsis/translations/korean.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/korean.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/korean.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -31,8 +31,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (remove only)"
-!define GAIM_PROMPT_WIPEOUT			"\xB0\xA1\xC0\xD3 \xB5\xF0\xB7\xBA\xC5丮\xB0\xA1 \xC1\xF6\xBF\xF6\xC1\xFA \xB0\xCD\xC0Դϴ\xD9. \xB0\xE8\xBC\xD3 \xC7ұ\xEE\xBF\xE4?$\r$\rNote: \xBA\xF1ǥ\xC1\xD8 \xC7÷\xAF\xB1\xD7\xC0\xCE\xC0\xBA \xC1\xF6\xBF\xF6\xC1\xF6\xC1\xF6 \xBE\xCA\xC0\xBB \xBC\xF6\xB5\xB5 \xC0ֽ\xC0\xB4ϴ\xD9.$\r\xB0\xA1\xC0\xD3 \xBB\xE7\xBF\xEB\xC0\xDA \xBC\xB3\xC1\xA4\xBF\xA1\xB4\xC2 \xBF\xB5\xC7\xE2\xC0\xBB \xB9\xCCġ\xC1\xF6 \xBEʽ\xC0\xB4ϴ\xD9."
-!define GAIM_PROMPT_DIR_EXISTS		"\xC0Է\xC2\xC7Ͻ\xC5 \xBC\xB3ġ \xB5\xF0\xB7\xBA\xC5丮\xB0\xA1 \xC0̹\xCC \xC0ֽ\xC0\xB4ϴ\xD9. \xBEȿ\xA1 \xB5\xE9\xC0\xBA \xB3\xBB\xBF\xEB\xC0\xCC \xC1\xF6\xBF\xF6\xC1\xFA \xBC\xF6\xB5\xB5 \xC0ֽ\xC0\xB4ϴ\xD9. \xB0\xE8\xBC\xD3\xC7ұ\xEE\xBF\xE4?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ \xB7\xB1Ÿ\xC0\xD3 \xBC\xB3ġ \xC1\xDF \xBF\xC0\xB7\xF9 \xB9߻\xFD."

Modified: trunk/gtk/win32/nsis/translations/kurdish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/kurdish.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/kurdish.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -48,8 +48,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (bi ten\xEA rake)"
-!define GAIM_PROMPT_WIPEOUT			"Peldanka Gaim ya kevn ya te niha t\xEA j\xEAbirin. Tu dixwaz\xEE bidom\xEEn\xEE?$\r$\rNot: Plugin y\xEAn nestandart y\xEAn te t\xEAn j\xEAbirin. .$\rV\xEAbijerk\xEAn bikarh\xEAner \xEAn Gaim nay\xEAn guherandin."
-!define GAIM_PROMPT_DIR_EXISTS		"Peldanka sazkirin\xEA ya tu hilbijart\xEE heye. Naveroka w\xEA $\rt\xEA j\xEAbirin. Tu dixwaz\xEE bidom\xEEn\xEE?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Di sazkirina GTK+ de \xE7ewt\xEE derket."

Modified: trunk/gtk/win32/nsis/translations/lithuanian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/lithuanian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/lithuanian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -45,8 +45,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (tik pa\xF0alinti)"
-!define GAIM_PROMPT_WIPEOUT			"J\xFBs\xF8 senasis Gaim katalogas tuoj tur\xEBt\xF8 b\xFBti i\xF0trintas. Ar norite t\xE6sti?$\r$\rPastaba: bet kokie nestandartiniai papildiniai, jeigu toki\xF8 \xE1dieg\xEBte, bus pa\xF0alinti.$\rGaim vartotojo nustatymai nebus paliesti."
-!define GAIM_PROMPT_DIR_EXISTS			"Nurodytas diegimo katalogas jau yra. Jo turinys$\rbus pa\xF0alintas. Ar norite t\xE6sti?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ vykdymo meto aplinkos diegimo klaida."

Modified: trunk/gtk/win32/nsis/translations/norwegian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/norwegian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/norwegian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (kun avinstallering)"
-!define GAIM_PROMPT_WIPEOUT			"Din gamle Gaim-katalog holder p\xE5 \xE5 slettes. \xD8nsker du \xE5 fortsette?$\r$\rMerk: Eventuelle ikke-standard plugin'er du har installert vil bli slettet.$\rGaims brukerinstillinger vil ikke bli ber\xF8rt."
-!define GAIM_PROMPT_DIR_EXISTS			"Installasjonskatalogen du har spesifisert finnes fra f\xF8r. Eventuelt innhold$\rvil bli slettet. \xD8nsker du \xE5 fortsette?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."

Modified: trunk/gtk/win32/nsis/translations/polish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/polish.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/polish.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (usu\xF1 program)"
-!define GAIM_PROMPT_WIPEOUT			"Stary katalog Gaim zosta\xB3 usuni\xEAty. Czy chcesz kontunuowa\xE6?$\r$\rNote: Wszystkie stare - niestandardowe plugin-y zosta\xB3y usuni\xEAte.$\r Ustawienia u\xBFutkownika Gaim b\xEAd\xB9 wy\xB3\xB9czone."
-!define GAIM_PROMPT_DIR_EXISTS		"Wybrany katalog instalacyjny ju\xBF istnieje. Jego zawarto\x9C\xE6 $\r zostanie skasowana. Czy chcesz kontunuowa\xE6?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"B\xB3\xB9d instalacji runtime-a GTK+."

Modified: trunk/gtk/win32/nsis/translations/portuguese-br.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/portuguese-br.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/portuguese-br.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -42,8 +42,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (apenas remover)"
-!define GAIM_PROMPT_WIPEOUT			"Sua antiga instala\xE7\xE3o do Gaim est\xE1 prestes a ser removida. Voc\xEA gostaria de continuar?$\r$\rNota: Quaisquer plugins n\xE3o-padr\xE3o que voc\xEA pode ter instalado ser\xE3o removidos.$\rAs configura\xE7\xF5es de usu\xE1rio do Gaim n\xE3o ser\xE3o afetadas."
-!define GAIM_PROMPT_DIR_EXISTS		"O diret\xF3rio de instala\xE7\xE3o do que voc\xEA especificou j\xE1 existe. Qualquer conte\xFAdo$\rser\xE1 deletado. Deseja continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execu\xE7\xE3o do GTK+."

Modified: trunk/gtk/win32/nsis/translations/portuguese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/portuguese.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/portuguese.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (remover apenas)"
-!define GAIM_PROMPT_WIPEOUT			"A directoria antiga do Gaim est\xE1 prestes a ser removida. Deseja continuar?$\r$\rNota: Quaisquer plugins n\xE3o-padr\xE3o que poder\xE1 ter instalado ser\xE3o removidos.$\rAs configura\xE7\xF5es de utilizador do Gaim n\xE3o ser\xE3o afectadas."
-!define GAIM_PROMPT_DIR_EXISTS		"A directoria de instala\xE7\xE3o que especificou j\xE1 existe. Qualquer conte\xFAdo$\rser\xE1 removido. Deseja continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execu\xE7\xE3o GTK+."

Modified: trunk/gtk/win32/nsis/translations/romanian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/romanian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/romanian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -46,8 +46,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (doar dezinstalare)"
-!define GAIM_PROMPT_WIPEOUT			"Vechiul director Gaim va fi \xBAters. Dori\xFEi s\xE3 continua\xFEi?$\r$\rNot\xE3: Orice module externe vor fi \xBAterse.$\rSet\xE3rile utilizatorilor Gaim nu vor fi afectate."
-!define GAIM_PROMPT_DIR_EXISTS		"Directorul ales pentru instalare exist\xE3 deja.$\rCon\xFEinutul s\xE3u va fi \xBAters. Dori\xFEi s\xE3 continua\xFEi?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Eroare la instalarea mediului GTK+."

Modified: trunk/gtk/win32/nsis/translations/russian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/russian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/russian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (\xF2\xEE\xEB\xFC\xEA\xEE \xF3\xE4\xE0\xEB\xE5\xED\xE8\xE5)"
-!define GAIM_PROMPT_WIPEOUT			"\xC2\xE0\xF8\xE0 \xF1\xF2\xE0\xF0\xE0\xFF \xE4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF Gaim \xE1\xF3\xE4\xE5\xF2 \xF4\xE0\xEA\xF2\xE8\xF7\xE5\xF1\xEA\xE8 \xF3\xE4\xE0\xEB\xE5\xED\xE0. \xC2\xFB \xE6\xE5\xEB\xE0\xE5\xF2\xE5 \xEF\xF0\xEE\xE4\xEE\xEB\xE6\xE8\xF2\xFC ?$\r$\r\xCF\xF0\xE8\xEC\xE5\xF7\xE0\xED\xE8\xE5: \xC2\xF1\xE5 \xED\xE5\xF1\xF2\xE0\xED\xE4\xE0\xF0\xF2\xED\xFB\xE5 \xEF\xEB\xE0\xE3\xE8\xED\xFB \xEA\xEE\xF2\xEE\xF0\xFB\xE5 \xC2\xFB \xF3\xF1\xF2\xE0\xED\xEE\xE2\xE8\xEB\xE8 \xE1\xF3\xE4\xF3\xF2 \xF3\xE4\xE0\xEB\xE5\xED\xFB..$\r\xCF\xEE\xEB\xFC\xE7\xEE\xE2\xE0\xF2\xE5\xEB\xFC\xF1\xEA\xE8\xE5 \xED\xE0\xF1\xF2\xF0\xEE\xE9\xEA\xE8 Gaim \xED\xE5 \xEF\xEE\xF1\xF2\xF0\xE0\xE4\xE0\xFE\xF2."
-!define GAIM_PROMPT_DIR_EXISTS		"\xC4\xE8\xF0\xE5\xEA\xF2\xEE\xF0\xE8\xFF, \xEA\xEE\xF2\xEE\xF0\xF3\xFE \xC2\xFB \xF3\xEA\xE0\xE7\xE0\xEB\xE8 \xE4\xEB\xFF \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE8 \xF3\xE6\xE5 \xF1\xF3\xF9\xE5\xF1\xF2\xE2\xF3\xE5\xF2. \xC2\xF1\xB8 \xF1\xEE\xE4\xE5\xF0\xE6\xE8\xEC\xEE\xE5$\r\xE1\xF3\xE4\xE5\xF2 \xF3\xE4\xE0\xEB\xE5\xED\xEE. \xC2\xFB \xE6\xE5\xEB\xE0\xE5\xF2\xE5 \xEF\xF0\xEE\xE4\xEE\xEB\xE6\xE8\xF2\xFC?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"\xCE\xF8\xE8\xE1\xEA\xE0 \xEF\xF0\xE8 \xF3\xF1\xF2\xE0\xED\xEE\xE2\xEA\xE5 \xEE\xEA\xF0\xF3\xE6\xE5\xED\xE8\xFF GTK+."

Modified: trunk/gtk/win32/nsis/translations/serbian-latin.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/serbian-latin.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/serbian-latin.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -31,8 +31,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (samo uklanjanje)"
-!define GAIM_PROMPT_WIPEOUT			"Va\x9A stari Gaim direktorijum \xE6e biti obrisan. Da li \x9Eelite da nastavite?$\r$\rPrimedba: Svi nestandardni dodaci koje ste instalirali \xE6e biti obrisani.$\rGaim postavke korisnika ne\xE6e biti promenjene."
-!define GAIM_PROMPT_DIR_EXISTS		"Instalacioni direktorijum koji ste naveli ve\xE6 postoji. Sav sadr\x9Eaj$\r\xE6e biti obrisan. Da li \x9Eelite da nastavite?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Gre\x9Aka prilikom instalacije GTK+ okoline za izvr\x9Aavanje."

Modified: trunk/gtk/win32/nsis/translations/simp-chinese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/simp-chinese.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/simp-chinese.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (ֻ\xC4\xDCɾ\xB3\xFD)"
-!define GAIM_PROMPT_WIPEOUT			"\xBC\xB4\xBD\xABɾ\xB3\xFD\xC4\xFA\xB5ľ\xC9 Gaim Ŀ¼\xA1\xA3\xC4\xFA\xCF\xEBҪ\xBC\xCC\xD0\xF8\xC2\xF0?$\r$\rע\xD2\xE2: \xC4\xFA\xCB\xF9\xB0\xB2װ\xB5\xC4\xC8κηDZ\xEA׼\xB5IJ\xE5\xBC\xFE\xB6\xBC\xBD\xAB\xB1\xBBɾ\xB3\xFD\xA1\xA3$\r\xB5\xAB\xCADz\xBB\xBB\xE1Ӱ\xCF\xEC Gaim \xD3û\xA7\xC9\xE8\xD6á\xA3"
-!define GAIM_PROMPT_DIR_EXISTS		"\xC4\xFAָ\xB6\xA8\xB5İ\xB2װĿ¼\xD2Ѿ\xAD\xB4\xE6\xD4ڡ\xA3$\r\xCB\xF9\xD3\xD0\xC4\xDA\xC8ݶ\xBC\xBD\xAB\xB1\xBBɾ\xB3\xFD\xA1\xA3\xC4\xFA\xCF\xEBҪ\xBC\xCC\xD0\xF8\xC2\xF0?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"\xB0\xB2װ GTK+ \xD4\xCB\xD0\xD0ʱ\xBF\xCCʧ\xB0ܡ\xA3"

Modified: trunk/gtk/win32/nsis/translations/slovak.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/slovak.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/slovak.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (len odstr\xE1ni\x9D)"
-!define GAIM_PROMPT_WIPEOUT			"V\xE1\x9A adres\xE1r Gaim bude zmazan\xFD. Chcete pokra\xE8ova\x9D?$\r$\rPozn\xE1mka: V\x9Aetky pr\xEDdavne pluginy, ktor\xE9 ste nain\x9Atalovali bud\xFA tie\x9E zmazan\xE9.$\rNastavenia u\x9Eivate\xBEsk\xE9ho \xFA\xE8tu Gaim-u bud\xFA ponechan\xE9."
-!define GAIM_PROMPT_DIR_EXISTS			"Adres\xE1r, ktor\xFD ste zadali, u\x9E existuje. Jeho obsah bude zmazan\xFD. Chcete pokra\xE8ova\x9D?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pri in\x9Atal\xE1cii GTK+ runtime."

Modified: trunk/gtk/win32/nsis/translations/slovenian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/slovenian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/slovenian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -47,8 +47,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (samo odstrani)"
-!define GAIM_PROMPT_WIPEOUT			"Va\x9A star imenik Gaim bo zbrisan. \x8Eelite nadaljevati?$\r$\rOpomba: Vsi nestandardni vti\xE8niki, ki ste jih namestili, bodo zbrisani.$\rUporabni\x9Ake nastavitve za Gaim se bodo ohranile."
-!define GAIM_PROMPT_DIR_EXISTS			"Namestitveni imenik, ki ste ga navedli, \x9Ee obstaja. Vsa vsebina$\rbo zbrisana. \x8Eelite nadaljevati?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Napaka pri namestitvi izvajalnega okolja GTK+."

Modified: trunk/gtk/win32/nsis/translations/spanish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/spanish.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/spanish.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -39,8 +39,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (s\xF3lo eliminar)"
-!define GAIM_PROMPT_WIPEOUT			"Su directorio antig\xFCo de Gaim va a ser borrado. \xBFDesea continuar?$\r$\rObservaci\xF3n: cualquier aplique no est\xE1ndar que pudiera haber instalado ser\xE1 borrado.$\r\xC9sto no afectar\xE1 a sus preferencias de usuario en Gaim."
-!define GAIM_PROMPT_DIR_EXISTS		"El directorio de instalaci\xF3n que ha especificado ya existe. Todos los contenidos$\rser\xE1 borrados. \xBFDesea continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error al instalar el ejecutable GTK+."

Modified: trunk/gtk/win32/nsis/translations/swedish.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/swedish.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/swedish.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -50,8 +50,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (enbart f\xF6r avinstallation)"
-!define GAIM_PROMPT_WIPEOUT			"Din gamla Gaim-katalog kommer att raderas, vill du forts\xE4tta?$\r$\rOBS! om du har installerat n\xE5gra extra insticksmoduler kommer de raderas.$\rGaims anv\xE4ndarinst\xE4llningar kommer inte p\xE5verkas."
-!define GAIM_PROMPT_DIR_EXISTS		"Den katalog du vill installera i finns redan. Allt i katalogen$\rkommer att raderas, vill du forts\xE4tta?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."

Modified: trunk/gtk/win32/nsis/translations/trad-chinese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/trad-chinese.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/trad-chinese.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -2,7 +2,7 @@
 ;;  trad-chinese.nsh
 ;;
 ;;  Traditional Chineese language strings for the Windows Gaim NSIS installer.
-;;  Windows Code page:950 
+;;  Windows Code page:950
 ;;
 ;;  Author: Paladin R. Liu <pa...@ms...>
 ;;  Minor updates: Ambrose C. Li <ac...@ad...>
@@ -12,7 +12,7 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"\xA6w\xB8˵{\xA6\xA1\xA5\xBF\xA6b\xB0\xF5\xA6椤\xA1C"
-!define GAIM_IS_RUNNING			"Gaim \xA5\xBF\xA6b\xB0\xF5\xA6椤\xA1A\xBDХ\xFD\xB5\xB2\xA7\xF4\xB3o\xADӵ{\xA6\xA1\xAB\xE1\xA6A\xA6\xE6\xA6w\xB8ˡC"
+!define GAIM_IS_RUNNING				"Gaim \xA5\xBF\xA6b\xB0\xF5\xA6椤\xA1A\xBDХ\xFD\xB5\xB2\xA7\xF4\xB3o\xADӵ{\xA6\xA1\xAB\xE1\xA6A\xA6\xE6\xA6w\xB8ˡC"
 !define GTK_INSTALLER_NEEDED			"\xA7䤣\xA8\xEC\xB2ŦX\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҩάO\xBBݭn\xB3Q\xA7\xF3\xB7s\xA1C$\r\xBDЦw\xB8\xCB v${GTK_VERSION} \xA5H\xA4W\xAA\xA9\xA5\xBB\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҡC"
 
 ; License Page
@@ -24,22 +24,22 @@
 !define GTK_SECTION_TITLE			"GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9\xD2 (\xA5\xB2\xBB\xDD)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ \xA7G\xB4\xBA\xA5D\xC3D"
 !define GTK_NOTHEME_SECTION_TITLE		"\xA4\xA3\xA6w\xB8˧G\xB4\xBA\xA5D\xC3D"
-!define GTK_WIMP_SECTION_TITLE		"Wimp \xA7G\xB4\xBA\xA5D\xC3D"
+!define GTK_WIMP_SECTION_TITLE			"Wimp \xA7G\xB4\xBA\xA5D\xC3D"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve \xA7G\xB4\xBA\xA5D\xC3D"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue \xA7G\xB4\xBA\xA5D\xC3D"
-!define GAIM_SHORTCUTS_SECTION_TITLE "\xB1\xB6\xAE|"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "\xAEୱ\xB1\xB6\xAE|"
+!define GAIM_SHORTCUTS_SECTION_TITLE		"\xB1\xB6\xAE|"
+!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"\xAEୱ\xB1\xB6\xAE|"
 !define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "\xB6}\xA9l\xA5\\xAF\xE0\xAA\xED"
 !define GAIM_SECTION_DESCRIPTION		"Gaim \xAE֤\xDF\xC0ɮפΰʺA\xA8禡\xAEw"
-!define GTK_SECTION_DESCRIPTION		"Gaim \xA9ҨϥΪ\xBA\xB8󥭥x\xB9ϧΤ\xB6\xAD\xB1\xA8禡\xAEw"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ \xA7G\xB4\xBA\xA5D\xC3D\xA5i\xA5H\xA5Ψӧ\xEF\xC5\xDC GTK+ \xC0\xB3\xA5ε{\xA6\xA1\xAA\xBA\xA5~\xC6[\xA1C"
+!define GTK_SECTION_DESCRIPTION			"Gaim \xA9ҨϥΪ\xBA\xB8󥭥x\xB9ϧΤ\xB6\xAD\xB1\xA8禡\xAEw"
+!define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ \xA7G\xB4\xBA\xA5D\xC3D\xA5i\xA5H\xA5Ψӧ\xEF\xC5\xDC GTK+ \xC0\xB3\xA5ε{\xA6\xA1\xAA\xBA\xA5~\xC6[\xA1C"
 !define GTK_NO_THEME_DESC			"\xA4\xA3\xA6w\xB8\xCB GTK+ \xA7G\xB4\xBA\xA5D\xC3D"
 !define GTK_WIMP_THEME_DESC			"\xA1uGTK-Wimp\xA1v(Windows impersonator) \xA5D\xC3D\xA5i\xC5\xFD GTK+ \xBFĤJ Windows \xA8\xF4\xAD\xB1\xC0\xF4\xC0\xA4\xA1C"
 !define GTK_BLUECURVE_THEME_DESC		"\xA1uBluecurve\xA1v\xA5D\xC3D"
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"\xA1uLighthouseblue\xA1v\xA5D\xC3D\xA1C"
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "\xABإ\xDF Gaim \xB1\xB6\xAE|"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "\xA6b\xAEୱ\xABإ߱\xB6\xAE|"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "\xA6b\xB6}\xA9l\xA5\\xAF\xE0\xAA\xED\xABإ߱\xB6\xAE|"
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"\xA1uLighthouseblue\xA1v\xA5D\xC3D\xA1C"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"\xABإ\xDF Gaim \xB1\xB6\xAE|"
+!define GAIM_DESKTOP_SHORTCUT_DESC		"\xA6b\xAEୱ\xABإ߱\xB6\xAE|"
+!define GAIM_STARTMENU_SHORTCUT_DESC		"\xA6b\xB6}\xA9l\xA5\\xAF\xE0\xAA\xED\xABإ߱\xB6\xAE|"
 
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"\xB5o\xB2{\xA4@\xAD\xD3\xC2ª\xA9\xAA\xBA GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9ҡC\xB1z\xADn\xB1N\xA5\xA6\xA4ɯŶܡH$\r\xBDЪ`\xB7N\xA1G\xA6p\xAAG\xB1z\xA4\xA3\xA4ɯšAGaim \xA5i\xAF\xE0\xB5L\xAAk\xA5\xBF\xBDT\xAA\xBA\xB3Q\xB0\xF5\xA6\xE6\xA1C"
@@ -49,8 +49,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim v${GAIM_VERSION} (\xA5u\xA8Ѳ\xBE\xB0\xA3)"
-!define GAIM_PROMPT_WIPEOUT			"\xB1z\xA5\xFD\xABe\xA6w\xB8˩\xF3\xA5ؿ\xFD\xA4\xA4\xAA\xBA\xC2ª\xA9 Gaim \xB1N\xB7|\xB3Q\xB2\xBE\xB0\xA3\xA1C\xB1z\xADn\xC4~\xC4\xF2\xB6ܡH$\r$\r\xBDЪ`\xB7N\xA1G\xA5\xF4\xA6\xF3\xB1z\xA9Ҧw\xB8˪\xBA\xABD\xA9x\xA4\xE8\xBA\xFB\xC5@\xBCҲճ\xA3\xB1N\xB3Q\xA7R\xB0\xA3\xA1C$\r\xA6\xD3 Gaim \xAA\xBA\xA8ϥΪ̳]\xA9w\xB1N\xA4\xA3\xB7|\xA8\xFC\xA8\xEC\xBCv\xC5T\xA1C"
-!define GAIM_PROMPT_DIR_EXISTS		"\xB1z\xA9ҿ\xEF\xA9w\xAA\xBA\xA6w\xB8˥ؿ\xFD\xA4U\xAA\xBA\xA9Ҧ\xB3\xC0ɮ׳\xA3\xB1N\xB3Q\xB2\xBE\xB0\xA3\xA1C$\r\xB1z\xADn\xC4~\xC4\xF2\xB6ܡH"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"\xA6w\xB8\xCB GTK+ \xB0\xF5\xA6\xE6\xC0\xF4\xB9Үɵo\xA5Ϳ\xF9\xBB~\xA1C"
@@ -60,5 +58,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"\xB1z\xA5ثe\xAA\xBA\xC5v\xAD\xAD\xB5L\xAAk\xA6w\xB8\xCB GTK+ \xA7G\xB4\xBA\xA5D\xC3D\xA1C"
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "\xB2\xBE\xB0\xA3\xB5{\xA6\xA1\xB5L\xAAk\xA7\xE4\xA8\xEC Gaim \xAA\xBA\xA6w\xB8˸\xEA\xB0T\xA1C$\r\xB3o\xC0\xB3\xB8ӬO\xA6\xB3\xA8\xE4\xA5L\xAA\xBA\xA8ϥΪ̭\xAB\xB7s\xA6w\xB8ˤF\xB3o\xADӵ{\xA6\xA1\xA1C"
-!define un.GAIM_UNINSTALL_ERROR_2         "\xB1z\xA5ثe\xAA\xBA\xC5v\xAD\xAD\xB5L\xAAk\xB2\xBE\xB0\xA3 Gaim\xA1C"
\ No newline at end of file
+!define un.GAIM_UNINSTALL_ERROR_1		"\xB2\xBE\xB0\xA3\xB5{\xA6\xA1\xB5L\xAAk\xA7\xE4\xA8\xEC Gaim \xAA\xBA\xA6w\xB8˸\xEA\xB0T\xA1C$\r\xB3o\xC0\xB3\xB8ӬO\xA6\xB3\xA8\xE4\xA5L\xAA\xBA\xA8ϥΪ̭\xAB\xB7s\xA6w\xB8ˤF\xB3o\xADӵ{\xA6\xA1\xA1C"
+!define un.GAIM_UNINSTALL_ERROR_2		"\xB1z\xA5ثe\xAA\xBA\xC5v\xAD\xAD\xB5L\xAAk\xB2\xBE\xB0\xA3 Gaim\xA1C"

Modified: trunk/gtk/win32/nsis/translations/valencian.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/valencian.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/valencian.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -50,8 +50,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (nomes borrar)"
-!define GAIM_PROMPT_WIPEOUT			"El teu directori antiu de Gaim sera borrat. \xBFVols continuar?$\r$\rNota: Qualsevol plugin no estandar que tingues instalat sera borrat.$\rLes preferencies d'usuari de Gaim no es voran afectades."
-!define GAIM_PROMPT_DIR_EXISTS			"El directori d'instalacio que especificares ya existix. Qualsevol contingut$\rsera borrat. \xBFVols continuar?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro instalant l'entorn GTK+."

Modified: trunk/gtk/win32/nsis/translations/vietnamese.nsh
===================================================================
--- trunk/gtk/win32/nsis/translations/vietnamese.nsh	2006-08-29 21:09:43 UTC (rev 17081)
+++ trunk/gtk/win32/nsis/translations/vietnamese.nsh	2006-08-30 02:40:56 UTC (rev 17082)
@@ -40,8 +40,6 @@
 
 ; Gaim Section Prompts and Texts
 !define GAIM_UNINSTALL_DESC			"Gaim (chỉ bỏ cài đặt)"
-!define GAIM_PROMPT_WIPEOUT			"Thư mục Gaim cũ sẽ bị xóa. Bạn muốn tiếp tục không?$\r$\rNote: Mọi plugin không chuẩn mà bạn đã cài sẽ bị xóa.$\rCác thiết lập người dùng Gaim sẽ không còn tác dụng."
-!define GAIM_PROMPT_DIR_EXISTS		"Thư mục cài đặt mà bạn định ra đã tồn tại rồi. Mọi nội dung$\rsẽ bị xóa. Bạn muốn tiếp tục không?"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Lỗi cài đặt GTK+ runtime."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17081] trunk/COPYRIGHT

[<rl...@us...>]

Revision: 17081
Author:   rlaager
Date:     2006-08-29 14:09:43 -0700 (Tue, 29 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17081&view=rev

Log Message:
-----------
Changing Hilbert to Hil, as per the patch submitter's request.

Modified Paths:
--------------
    trunk/COPYRIGHT
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-08-29 14:18:04 UTC (rev 17080)
+++ trunk/COPYRIGHT	2006-08-29 21:09:43 UTC (rev 17081)
@@ -129,7 +129,7 @@
 Mike Heffner
 Benjamin Herrenschmidt
 Fernando Herrera
-Hilbert
+Hil
 Casey Ho
 Iain Holmes
 Joshua Honeycutt


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17080] trunk/libgaim/protocols/yahoo/yahoo.c

[<ma...@us...>]

Revision: 17080
Author:   marv_sf
Date:     2006-08-29 07:18:04 -0700 (Tue, 29 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17080&view=rev

Log Message:
-----------
This should fix bleeter's crash, the backtrace shows the group is null. I probably need see the packets to fix 
it better, this will just ignore buddies not in a group instead of figuring out their group.

Modified Paths:
--------------
    trunk/libgaim/protocols/yahoo/yahoo.c
Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c	2006-08-29 04:33:53 UTC (rev 17079)
+++ trunk/libgaim/protocols/yahoo/yahoo.c	2006-08-29 14:18:04 UTC (rev 17080)
@@ -499,6 +499,8 @@
 			grp = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 7: /* buddy's s/n */
+			if (!grp) /* this buddy isn't in a group?! */
+				break;
 			g_free(norm_bud);
 			norm_bud = g_strdup(gaim_normalize(account, pair->value));
 			f = yahoo_friend_find_or_new(gc, norm_bud);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17079] trunk/libgaim/plugins/perl

[<dat...@us...>]

Revision: 17079
Author:   datallah
Date:     2006-08-28 21:33:53 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17079&view=rev

Log Message:
-----------
Remove the gtkgaim headers from the include path.

Modified Paths:
--------------
    trunk/libgaim/plugins/perl/Makefile.mingw
    trunk/libgaim/plugins/perl/common/Makefile.mingw
Modified: trunk/libgaim/plugins/perl/Makefile.mingw
===================================================================
--- trunk/libgaim/plugins/perl/Makefile.mingw	2006-08-29 04:15:29 UTC (rev 17078)
+++ trunk/libgaim/plugins/perl/Makefile.mingw	2006-08-29 04:33:53 UTC (rev 17079)
@@ -19,20 +19,13 @@
 			-I$(GAIM_TOP) \
 			-I$(GAIM_LIB_TOP) \
 			-I$(GAIM_LIB_TOP)/win32 \
-			-I$(GAIM_GTK_TOP) \
-			-I$(GAIM_GTK_TOP)/win32 \
 			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/include/pango-1.0 \
-			-I$(GTK_TOP)/include/atk-1.0 \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP) \
 			-L$(PERL_LIB_TOP)
 
 ##
@@ -54,7 +47,6 @@
 			-lws2_32 \
 			-lintl \
 			-lgaim \
-			-lgtkgaim \
 			-lperl58
 
 include $(GAIM_COMMON_RULES)
@@ -76,7 +68,7 @@
 ##
 ## BUILD DLL
 ##
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(OBJECTS)
+$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS)  -Wl,--export-all-symbols -o $(TARGET).dll
 
 ##
@@ -84,7 +76,7 @@
 ##
 clean:
 	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll $(TARGET).lib
+	rm -rf $(TARGET).dll
 	$(MAKE) -C ./common -f $(GAIM_WIN32_MAKEFILE) clean
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/plugins/perl/common/Makefile.mingw
===================================================================
--- trunk/libgaim/plugins/perl/common/Makefile.mingw	2006-08-29 04:15:29 UTC (rev 17078)
+++ trunk/libgaim/plugins/perl/common/Makefile.mingw	2006-08-29 04:33:53 UTC (rev 17079)
@@ -20,20 +20,14 @@
 INCLUDE_PATHS =		-I. \
 			-I$(GAIM_TOP) \
 			-I$(GAIM_LIB_TOP) \
-			-I$(GAIM_GTK_TOP) \
 			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/include/pango-1.0 \
-			-I$(GTK_TOP)/include/atk-1.0 \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(PERL_LIB_TOP)/CORE
 
 LIB_PATHS = 		-L$(PERL_LIB_TOP) \
 			-L$(PERL_PLUGIN_TOP) \
 			-L$(GAIM_LIB_TOP) \
-			-L$(GAIM_GTK_TOP) \
 			-L$(GTK_TOP)/lib
 
 ##
@@ -83,7 +77,6 @@
 LIBS =			-lperl58 \
 			-lperl \
 			-lgaim \
-			-lgtkgaim \
 			-lglib-2.0
 
 include $(GAIM_COMMON_RULES)
@@ -110,7 +103,7 @@
 	cp Gaim.pm ./lib
 	$(PERL) -MAutoSplit -e 'autosplit("lib/Gaim.pm")'
 
-$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(GAIM_GTKGAIM_DLL).a $(FALLBACKS) $(OBJECTS)
+$(TARGET).dll: $(GAIM_LIBGAIM_DLL).a $(FALLBACKS) $(OBJECTS)
 	$(CC) -shared $(OBJECTS) $(LIB_PATHS) $(LIBS) -o $(TARGET).dll
 
 ##


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17078] trunk/libgaim/plugins

[<de...@us...>]

Revision: 17078
Author:   deryni9
Date:     2006-08-28 21:15:29 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17078&view=rev

Log Message:
-----------
Reenable the perl build on non-Windows. I'm looking at making a gtk perl
plugin to use the gtk stuff, we'll see if I succeed. I'm leaving the gtk stuff
in here but ifdef:d out for now. I'll clean it up if I get the gtk perl plugin
working.

Modified Paths:
--------------
    trunk/libgaim/plugins/Makefile.am
    trunk/libgaim/plugins/perl/Makefile.am
    trunk/libgaim/plugins/perl/common/Makefile.PL.in
    trunk/libgaim/plugins/perl/common/Network.xs
    trunk/libgaim/plugins/perl/common/module.h
    trunk/libgaim/plugins/perl/common/typemap
    trunk/libgaim/plugins/perl/perl-handlers.h
    trunk/libgaim/plugins/perl/perl.c
Modified: trunk/libgaim/plugins/Makefile.am
===================================================================
--- trunk/libgaim/plugins/Makefile.am	2006-08-29 03:47:34 UTC (rev 17077)
+++ trunk/libgaim/plugins/Makefile.am	2006-08-29 04:15:29 UTC (rev 17078)
@@ -1,9 +1,7 @@
 DIST_SUBDIRS = mono perl ssl tcl
 
 if USE_PERL
-# Fix the perl plugin to not use gtk first
-# PERL_DIR = perl
-PERL_DIR = 
+PERL_DIR = perl
 endif
 
 if USE_TCL

Modified: trunk/libgaim/plugins/perl/Makefile.am
===================================================================
--- trunk/libgaim/plugins/perl/Makefile.am	2006-08-29 03:47:34 UTC (rev 17077)
+++ trunk/libgaim/plugins/perl/Makefile.am	2006-08-29 04:15:29 UTC (rev 17078)
@@ -158,8 +158,7 @@
 	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libgaim \
-	-I$(top_srcdir)/gtk \  # FIXME
 	$(DEBUG_CFLAGS) \
-	$(GTK_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(PLUGIN_CFLAGS) \
 	$(PERL_CFLAGS)

Modified: trunk/libgaim/plugins/perl/common/Makefile.PL.in
===================================================================
--- trunk/libgaim/plugins/perl/common/Makefile.PL.in	2006-08-29 03:47:34 UTC (rev 17077)
+++ trunk/libgaim/plugins/perl/common/Makefile.PL.in	2006-08-29 04:15:29 UTC (rev 17078)
@@ -11,7 +11,7 @@
        AUTHOR     => 'Christian Hammond <ch...@gn...>') : ()),
     'LIBS'		=> [''], # e.g., '-lm'
     'DEFINE'		=> '@DEBUG_CFLAGS@', # e.g., '-DHAVE_SOMETHING'
-    'INC'		=> '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/src @GLIB_CFLAGS@ @GTK_CFLAGS@', # e.g., '-I. -I/usr/include/other'
+    'INC'		=> '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libgaim @GLIB_CFLAGS@', # e.g., '-I. -I/usr/include/other'
     'OBJECT'		=> '$(O_FILES)', # link all the C files too
 );
 

Modified: trunk/libgaim/plugins/perl/common/Network.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Network.xs	2006-08-29 03:47:34 UTC (rev 17077)
+++ trunk/libgaim/plugins/perl/common/Network.xs	2006-08-29 04:15:29 UTC (rev 17078)
@@ -25,14 +25,14 @@
 gaim_network_ip_atoi(ip)
 	const char *ip
 
-Gaim::NetworkListenData *
+Gaim::NetworkListenData
 gaim_network_listen(port, socket_type, cb, cb_data)
 	unsigned short port
 	int socket_type
 	Gaim::NetworkListenCallback cb
 	gpointer cb_data
 
-Gaim::NetworkListenData *
+Gaim::NetworkListenData
 gaim_network_listen_range(start, end, socket_type, cb, cb_data)
 	unsigned short start
 	unsigned short end

Modified: trunk/libgaim/plugins/perl/common/module.h
===================================================================
--- trunk/libgaim/plugins/perl/common/module.h	2006-08-29 03:47:34 UTC (rev 17077)
+++ trunk/libgaim/plugins/perl/common/module.h	2006-08-29 04:15:29 UTC (rev 17078)
@@ -28,11 +28,13 @@
 #include "desktopitem.h"
 #include "eventloop.h"
 #include "ft.h"
+#ifdef GAIM_GTKPERL
 #include "gtkaccount.h"
 #include "gtkblist.h"
 #include "gtkconn.h"
 #include "gtkconv.h"
 #include "gtkutils.h"
+#endif
 #include "imgstore.h"
 #include "network.h"
 #include "notify.h"
@@ -96,7 +98,6 @@
 
 /* conversation.h */
 typedef GaimConversationType		Gaim__ConversationType;
-typedef GaimUnseenState			Gaim__UnseenState;
 typedef GaimConvUpdateType		Gaim__ConvUpdateType;
 typedef GaimTypingState			Gaim__TypingState;
 typedef GaimMessageFlags		Gaim__MessageFlags;
@@ -124,6 +125,7 @@
 typedef GaimXferStatusType		Gaim__XferStatusType;
 typedef GaimXferUiOps *			Gaim__XferUiOps;
 
+#ifdef GAIM_GTKPERL
 /* gtkblish.h */
 typedef GaimGtkBuddyList *		Gaim__GTK__BuddyList;
 typedef GaimStatusIconSize		Gaim__StatusIconSize;
@@ -136,6 +138,7 @@
 #endif /* _WIN32 */
 
 /* gtkconv.h */
+typedef GaimUnseenState			Gaim__UnseenState;
 typedef GaimGtkConversation *		Gaim__GTK__Conversation;
 typedef GdkPixbuf *			Gaim__GDK__Pixbuf;
 typedef GtkWidget *			Gaim__GTK__Widget;
@@ -146,6 +149,7 @@
 typedef GtkTextView *			Gaim__GTK__TextView;
 
 /* gtkconn.h */
+#endif
 
 /* imgstore.h */
 typedef GaimStoredImage *		Gaim__StoredImage;
@@ -159,7 +163,7 @@
 typedef GaimLogType			Gaim__LogType;
 
 /* network.h */
-typedef GaimNetworkListenData		Gaim__NetworkListenData;
+typedef GaimNetworkListenData *		Gaim__NetworkListenData;
 typedef GaimNetworkListenCallback	Gaim__NetworkListenCallback;
 
 /* notify.h */

Modified: trunk/libgaim/plugins/perl/common/typemap
===================================================================
--- trunk/libgaim/plugins/perl/common/typemap	2006-08-29 03:47:34 UTC (rev 17077)
+++ trunk/libgaim/plugins/perl/common/typemap	2006-08-29 04:15:29 UTC (rev 17078)
@@ -92,6 +92,7 @@
 
 Gaim::Menu::Action			T_GaimObj
 
+Gaim::NetworkListenData			T_GaimObj
 Gaim::NetworkListenCallback		T_PTR
 
 Gaim::NotifyCloseCallback		T_PTR

Modified: trunk/libgaim/plugins/perl/perl-handlers.h
===================================================================
--- trunk/libgaim/plugins/perl/perl-handlers.h	2006-08-29 03:47:34 UTC (rev 17077)
+++ trunk/libgaim/plugins/perl/perl-handlers.h	2006-08-29 04:15:29 UTC (rev 17078)
@@ -5,8 +5,10 @@
 #include "plugin.h"
 #include "prefs.h"
 #include "pluginpref.h"
+#ifdef GAIM_GTKPERL
 #include "gtkplugin.h"
 #include "gtkutils.h"
+#endif
 
 typedef struct
 {
@@ -42,7 +44,9 @@
 
 GaimPluginPrefFrame *gaim_perl_get_plugin_frame(GaimPlugin *plugin);
 
+#ifdef GAIM_GTKPERL
 GtkWidget *gaim_perl_gtk_get_plugin_frame(GaimPlugin *plugin);
+#endif
 
 void gaim_perl_timeout_add(GaimPlugin *plugin, int seconds, SV *callback,
                            SV *data);

Modified: trunk/libgaim/plugins/perl/perl.c
===================================================================
--- trunk/libgaim/plugins/perl/perl.c	2006-08-29 03:47:34 UTC (rev 17077)
+++ trunk/libgaim/plugins/perl/perl.c	2006-08-29 04:15:29 UTC (rev 17078)
@@ -304,9 +304,11 @@
 			/* Set id here in case we don't find one later. */
 			info->id = g_strdup(SvPV(*key, len));
 
+#ifdef GAIM_GTKPERL
 			if ((key = hv_fetch(plugin_info, "GTK_UI",
 			                    strlen("GTK_UI"), 0)))
 				info->ui_requirement = GAIM_GTK_PLUGIN_TYPE;
+#endif
 
 			if ((key = hv_fetch(plugin_info, "url",
 			                    strlen("url"), 0)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17077] trunk/console/libgnt/gnttextview.c

[<sa...@us...>]

Revision: 17077
Author:   sadrul
Date:     2006-08-28 20:47:34 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17077&view=rev

Log Message:
-----------
The width of the conversation windows can now be resized.

Modified Paths:
--------------
    trunk/console/libgnt/gnttextview.c
Modified: trunk/console/libgnt/gnttextview.c
===================================================================
--- trunk/console/libgnt/gnttextview.c	2006-08-29 02:22:08 UTC (rev 17076)
+++ trunk/console/libgnt/gnttextview.c	2006-08-29 03:47:34 UTC (rev 17077)
@@ -8,7 +8,8 @@
 
 typedef struct
 {
-	GntTextFormatFlags flags;
+	GntTextFormatFlags tvflag;
+	chtype flags;
 	char *text;
 } GntTextSegment;
 
@@ -16,6 +17,7 @@
 {
 	GList *segments;         /* A list of GntTextSegments */
 	int length;              /* The current length of the line so far (ie. onscreen width) */
+	gboolean soft;           /* TRUE if it's an overflow from prev. line */
 } GntTextLine;
 
 static GntWidgetClass *parent_class = NULL;
@@ -148,6 +150,59 @@
 }
 
 static void
+gnt_text_view_reflow(GntTextView *view)
+{
+	/* This is pretty ugly, and inefficient. Someone do something about it. */
+	GntTextLine *line;
+	GList *back, *iter, *list;
+	int pos = 0;
+
+	list = view->list;
+	while (list->prev) {
+		line = list->data;
+		if (!line->soft)
+			pos++;
+		list = list->prev;
+	}
+
+	back = g_list_last(view->list);
+	view->list = NULL;
+	gnt_text_view_clear(view);
+
+	for (; back; back = back->prev) {
+		line = back->data;
+
+		if (back->next && !line->soft)
+			gnt_text_view_next_line(view);
+
+		for (iter = line->segments; iter; iter = iter->next) {
+			GntTextSegment *seg = iter->data;
+			gnt_text_view_append_text_with_flags(view, seg->text, seg->tvflag);
+		}
+
+		free_text_line(line, NULL);
+	}
+	g_list_free(list);
+
+	list = view->list = g_list_first(view->list);
+	while (pos--) {
+		while (((GntTextLine*)list->data)->soft)
+			list = list->next;
+		list = list->next;
+	}
+	view->list = list;
+	gnt_widget_draw(GNT_WIDGET(view));
+}
+
+static void
+gnt_text_view_size_changed(GntWidget *widget, int w, int h)
+{
+	if (w != widget->priv.width) {
+		gnt_text_view_reflow(GNT_TEXT_VIEW(widget));
+	}
+}
+
+static void
 gnt_text_view_class_init(GntTextViewClass *klass)
 {
 	parent_class = GNT_WIDGET_CLASS(klass);
@@ -157,6 +212,7 @@
 	parent_class->size_request = gnt_text_view_size_request;
 	parent_class->key_pressed = gnt_text_view_key_pressed;
 	parent_class->clicked = gnt_text_view_clicked;
+	parent_class->size_changed = gnt_text_view_size_changed;
 
 	DEBUG;
 }
@@ -166,9 +222,7 @@
 {
 	GntWidget *widget = GNT_WIDGET(instance);
 	
-	/* XXX: For now, resizing the width is not permitted. This is because
-	 * of the way I am handling wrapped lines. */
-	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_GROW_Y);
+	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_GROW_Y | GNT_WIDGET_GROW_X);
 
 	widget->priv.minw = 5;
 	widget->priv.minh = 2;
@@ -256,6 +310,7 @@
 			if (len) {
 				GntTextSegment *seg = g_new0(GntTextSegment, 1);
 				seg->flags = fl;
+				seg->tvflag = flags;
 				seg->text = g_new0(char, len + 1);
 				g_utf8_strncpy(seg->text, iter, g_utf8_pointer_to_offset(iter, iter + len));
 				line->segments = g_list_append(line->segments, seg);
@@ -264,10 +319,12 @@
 				iter += len;
 				if (line->length >= widget->priv.width - 1 && *iter) {
 					line = g_new0(GntTextLine, 1);
+					line->soft = TRUE;
 					view->list = g_list_prepend(g_list_first(view->list), line);
 				}
 			} else {
 				line = g_new0(GntTextLine, 1);
+				line->soft = TRUE;
 				view->list = g_list_prepend(g_list_first(view->list), line);
 			}
 		}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17076] trunk

[<rl...@us...>]

Revision: 17076
Author:   rlaager
Date:     2006-08-28 19:22:08 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17076&view=rev

Log Message:
-----------
SF Patch #1547720 from Hilbert
Fixes SF Bug #1541097

If you search, leave the Find dialog open, switch tabs, and search again, the search happens in the original tab.  This patch fixes that bug.  Now when you search, it searches in the active conversation window.

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/doc/CREDITS
    trunk/doc/ChangeLog.API
    trunk/gtk/gtkconv.c
    trunk/gtk/gtkconv.h
    trunk/gtk/gtkconvwin.h
Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-08-29 01:58:14 UTC (rev 17075)
+++ trunk/COPYRIGHT	2006-08-29 02:22:08 UTC (rev 17076)
@@ -129,6 +129,7 @@
 Mike Heffner
 Benjamin Herrenschmidt
 Fernando Herrera
+Hilbert
 Casey Ho
 Iain Holmes
 Joshua Honeycutt

Modified: trunk/doc/CREDITS
===================================================================
--- trunk/doc/CREDITS	2006-08-29 01:58:14 UTC (rev 17075)
+++ trunk/doc/CREDITS	2006-08-29 02:22:08 UTC (rev 17076)
@@ -1,5 +1,8 @@
 gaim: The Pimpin' Penguin IM Clone that's Good For The Soul! 
 
+This file is very old.  Newer developers and contributors are
+credited in the AUTHORS and COPYRIGHT files.
+
 CREDITS
 -------
 Authors:

Modified: trunk/doc/ChangeLog.API
===================================================================
--- trunk/doc/ChangeLog.API	2006-08-29 01:58:14 UTC (rev 17075)
+++ trunk/doc/ChangeLog.API	2006-08-29 02:22:08 UTC (rev 17076)
@@ -193,6 +193,7 @@
 	  GaimConversation
 	* Removed ui_ops from GaimBuddyList. Use gaim_blist_get_ui_ops() instead
 	* GaimGtkLogViewer hidden... You weren't using it anyway.
+	* GaimGtkConversation: dialogs (dialogs.search moved to GaimGtkWindow)
 
 	Added:
 	* gaim_prefs_disconnect_by_handle()
@@ -315,6 +316,7 @@
 	  query.
 	* gaim_util_fetch_url_cancel(): Can be used to cancel a pending
 	  call to gaim_util_fetch_url() or gaim_util_fetch_url_request().
+	* GaimGtkWindow: dialogs.search (previously in GaimGtkConversation)
 
 	Signals - Changed:  (See the Doxygen docs for details on all signals.)
 	* Signal propagation now stops after a handler returns a non-NULL value.

Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c	2006-08-29 01:58:14 UTC (rev 17075)
+++ trunk/gtk/gtkconv.c	2006-08-29 02:22:08 UTC (rev 17076)
@@ -1039,25 +1039,53 @@
 }
 
 struct _search {
-	GaimGtkConversation *gtkconv;
+	GaimGtkWindow *gtkwin;
 	GtkWidget *entry;
 };
 
 static void do_search_cb(GtkWidget *widget, gint resp, struct _search *s)
 {
-	switch (resp) {
-	case GTK_RESPONSE_OK:
-	    gtk_imhtml_search_find(GTK_IMHTML(s->gtkconv->imhtml),
-							   gtk_entry_get_text(GTK_ENTRY(s->entry)));
-		break;
+	GaimConversation *conv;
+	GaimGtkConversation *gtk_active_conv;
+	GList *iter;
 
-	case GTK_RESPONSE_DELETE_EVENT:
-	case GTK_RESPONSE_CLOSE:
-		gtk_imhtml_search_clear(GTK_IMHTML(s->gtkconv->imhtml));
-		gtk_widget_destroy(s->gtkconv->dialogs.search);
-		s->gtkconv->dialogs.search = NULL;
-		g_free(s);
-		break;
+	conv = gaim_gtk_conv_window_get_active_conversation(s->gtkwin);
+	gtk_active_conv = GAIM_GTK_CONVERSATION(conv);
+
+	switch (resp)
+	{
+		case GTK_RESPONSE_OK:
+			/* clear highlighting except the active conversation window
+			 * highlight the keywords in the active conversation window */
+			for (iter = gaim_gtk_conv_window_get_gtkconvs(s->gtkwin) ; iter ; iter = iter->next)
+			{
+				GaimGtkConversation *gtkconv = iter->data;
+
+				if (gtkconv != gtk_active_conv)
+				{
+					gtk_imhtml_search_clear(GTK_IMHTML(gtkconv->imhtml));
+				}
+				else
+				{
+					gtk_imhtml_search_find(GTK_IMHTML(gtk_active_conv->imhtml),
+					                       gtk_entry_get_text(GTK_ENTRY(s->entry)));
+				}
+			}
+			break;
+
+		case GTK_RESPONSE_DELETE_EVENT:
+		case GTK_RESPONSE_CLOSE:
+			/* clear the keyword highlighting in all the conversation windows */
+			for (iter = gaim_gtk_conv_window_get_gtkconvs(s->gtkwin); iter; iter=iter->next)
+			{
+				GaimGtkConversation *gconv = iter->data;
+				gtk_imhtml_search_clear(GTK_IMHTML(gconv->imhtml));
+			}
+
+			gtk_widget_destroy(s->gtkwin->dialogs.search);
+			s->gtkwin->dialogs.search = NULL;
+			g_free(s);
+			break;
 	}
 }
 
@@ -1065,45 +1093,43 @@
 menu_find_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimGtkWindow *gtkwin = data;
-	GaimConversation *conv = gaim_gtk_conv_window_get_active_conversation(gtkwin);
-	GaimGtkConversation *gtkconv = GAIM_GTK_CONVERSATION(conv);
 	GtkWidget *hbox;
 	GtkWidget *img = gtk_image_new_from_stock(GAIM_STOCK_DIALOG_QUESTION,
 											  GTK_ICON_SIZE_DIALOG);
 	GtkWidget *label;
 	struct _search *s;
 
-	if (gtkconv->dialogs.search) {
-		gtk_window_present(GTK_WINDOW(gtkconv->dialogs.search));
+	if (gtkwin->dialogs.search) {
+		gtk_window_present(GTK_WINDOW(gtkwin->dialogs.search));
 		return;
 	}
 
 	s = g_malloc(sizeof(struct _search));
-	s->gtkconv = gtkconv;
+	s->gtkwin = gtkwin;
 
-	gtkconv->dialogs.search = gtk_dialog_new_with_buttons(_("Find"),
+	gtkwin->dialogs.search = gtk_dialog_new_with_buttons(_("Find"),
 			GTK_WINDOW(gtkwin->window), GTK_DIALOG_DESTROY_WITH_PARENT,
 			GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 			GTK_STOCK_FIND, GTK_RESPONSE_OK, NULL);
-	gtk_dialog_set_default_response(GTK_DIALOG(gtkconv->dialogs.search),
+	gtk_dialog_set_default_response(GTK_DIALOG(gtkwin->dialogs.search),
 									GTK_RESPONSE_OK);
-	g_signal_connect(G_OBJECT(gtkconv->dialogs.search), "response",
+	g_signal_connect(G_OBJECT(gtkwin->dialogs.search), "response",
 					 G_CALLBACK(do_search_cb), s);
 
-	gtk_container_set_border_width(GTK_CONTAINER(gtkconv->dialogs.search), GAIM_HIG_BOX_SPACE);
-	gtk_window_set_resizable(GTK_WINDOW(gtkconv->dialogs.search), FALSE);
-	gtk_dialog_set_has_separator(GTK_DIALOG(gtkconv->dialogs.search), FALSE);
-	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkconv->dialogs.search)->vbox), GAIM_HIG_BORDER);
+	gtk_container_set_border_width(GTK_CONTAINER(gtkwin->dialogs.search), GAIM_HIG_BOX_SPACE);
+	gtk_window_set_resizable(GTK_WINDOW(gtkwin->dialogs.search), FALSE);
+	gtk_dialog_set_has_separator(GTK_DIALOG(gtkwin->dialogs.search), FALSE);
+	gtk_box_set_spacing(GTK_BOX(GTK_DIALOG(gtkwin->dialogs.search)->vbox), GAIM_HIG_BORDER);
 	gtk_container_set_border_width(
-		GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox), GAIM_HIG_BOX_SPACE);
+		GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox), GAIM_HIG_BOX_SPACE);
 
 	hbox = gtk_hbox_new(FALSE, GAIM_HIG_BORDER);
-	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkconv->dialogs.search)->vbox),
+	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(gtkwin->dialogs.search)->vbox),
 					  hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 
 	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
-	gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkconv->dialogs.search),
+	gtk_dialog_set_response_sensitive(GTK_DIALOG(gtkwin->dialogs.search),
 									  GTK_RESPONSE_OK, FALSE);
 
 	label = gtk_label_new(NULL);
@@ -1115,10 +1141,10 @@
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), GTK_WIDGET(s->entry));
 	g_signal_connect(G_OBJECT(s->entry), "changed",
 					 G_CALLBACK(gaim_gtk_set_sensitive_if_input),
-					 gtkconv->dialogs.search);
+					 gtkwin->dialogs.search);
 	gtk_box_pack_start(GTK_BOX(hbox), s->entry, FALSE, FALSE, 0);
 
-	gtk_widget_show_all(gtkconv->dialogs.search);
+	gtk_widget_show_all(gtkwin->dialogs.search);
 	gtk_widget_grab_focus(s->entry);
 }
 
@@ -4474,10 +4500,6 @@
 	gaim_request_close_with_handle(gtkconv);
 	gaim_notify_close_with_handle(gtkconv);
 
-	/* Close the "Find" dialog if it's open */
-	if (gtkconv->dialogs.search)
-		gtk_widget_destroy(gtkconv->dialogs.search);
-
 	gtk_widget_destroy(gtkconv->tab_cont);
 	g_object_unref(gtkconv->tab_cont);
 
@@ -7481,6 +7503,10 @@
 	gaim_prefs_disconnect_by_handle(win);
 	window_list = g_list_remove(window_list, win);
 
+	/* Close the "Find" dialog if it's open */
+	if (win->dialogs.search)
+		gtk_widget_destroy(win->dialogs.search);
+
 	if (win->gtkconvs) {
 		while (win->gtkconvs) {
 			GList *nextgtk = win->gtkconvs->next;

Modified: trunk/gtk/gtkconv.h
===================================================================
--- trunk/gtk/gtkconv.h	2006-08-29 01:58:14 UTC (rev 17075)
+++ trunk/gtk/gtkconv.h	2006-08-29 02:22:08 UTC (rev 17076)
@@ -142,13 +142,6 @@
 	GaimUnseenState unseen_state;
 	guint unseen_count;
 
-	struct
-	{
-		GtkWidget *image;
-		GtkWidget *search;
-
-	} dialogs;
-
 	union
 	{
 		GaimGtkImPane   *im;

Modified: trunk/gtk/gtkconvwin.h
===================================================================
--- trunk/gtk/gtkconvwin.h	2006-08-29 01:58:14 UTC (rev 17075)
+++ trunk/gtk/gtkconvwin.h	2006-08-29 02:22:08 UTC (rev 17076)
@@ -78,6 +78,12 @@
 
 	} menu;
 
+	struct
+	{
+		GtkWidget *search;
+
+	} dialogs;
+
 	/* Tab dragging stuff. */
 	gboolean in_drag;
 	gboolean in_predrag;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17075] trunk/doc/gntgaim.1.in

[<sa...@us...>]

Revision: 17075
Author:   sadrul
Date:     2006-08-28 18:58:14 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17075&view=rev

Log Message:
-----------
Update the manual for mouse-support and window-manager in gntgaim.

Modified Paths:
--------------
    trunk/doc/gntgaim.1.in
Modified: trunk/doc/gntgaim.1.in
===================================================================
--- trunk/doc/gntgaim.1.in	2006-08-29 01:49:30 UTC (rev 17074)
+++ trunk/doc/gntgaim.1.in	2006-08-29 01:58:14 UTC (rev 17075)
@@ -107,6 +107,14 @@
 .br
 shadow = 0
 .br
+# There is experimental mouse support
+.br
+mouse = 1
+.br
+# To use some custom window-manager
+.br
+wm = /usr/local/lib/gaim/s.so
+.br
 
 .br
 [colors]
@@ -181,6 +189,23 @@
 \\  = \\r
 .br
 
+.SH Mouse Support
+There is experimental mouse support. You can focus windows, activate buttons,
+select rows in a list, scroll using the wheel-scroll etc. Mouse support is
+disabled by default, so you need to enable it in ~/.gntrc (see the sample
+above).
+
+.SH Window Management
+The default window management is very limited. But it is possible to write
+custom window managers to suit your needs. There is a sample window-manager
+included (named \fIs.so\fR) which adds a little 'close-button' for the windows,
+removes the borders from the buddylist and pops up new windows in the middle of
+the screen, instead of at the upper-left corder. It is provided as a sample
+simple manager, but it should be possible to write more complex managers, and
+it's very possible that the window-manager API will need to be enhanced. Look at
+the sample ~/.gntrc file above to see how to select a window-manager.
+
+
 .SH Conversation Commands
 There are a few helpful commands in addition to the regular commands. You can
 use these from any conversation to access other windows.
@@ -226,6 +251,9 @@
 fixed at each release, and if yours is out of date, the problem may already have
 been solved.
 
+You are also encouraged to drop by at \fB#gaim\fR on \fIirc.freenode.net\fR to
+discuss about development.
+
 .SH SEE ALSO
 \fIhttp://gaim.sourceforge.net/\fR
 .br


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17074] trunk/libgaim/protocols/msn/msn.c

[<sa...@us...>]

Revision: 17074
Author:   sadrul
Date:     2006-08-28 18:49:30 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17074&view=rev

Log Message:
-----------
Patch #1548271: "Get Info fix for MSN"
"'Get Info' currently fails for MSN buddies. This patch
fixes that, and possibly plugs a small leak."
and
"rlaager: sadrul: I don't care to both with reviewing 1548271. I trust you know what you're doing. You can just commit that one. ;)"
So you know who to blame if things don't work ;)

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/msn.c
Modified: trunk/libgaim/protocols/msn/msn.c
===================================================================
--- trunk/libgaim/protocols/msn/msn.c	2006-08-29 01:00:18 UTC (rev 17073)
+++ trunk/libgaim/protocols/msn/msn.c	2006-08-29 01:49:30 UTC (rev 17074)
@@ -1420,7 +1420,7 @@
 
 #define MSN_GOT_INFO_GET_FIELD(a, b) \
 	found = gaim_markup_extract_info_field(stripped, stripped_len, s, \
-			"\n" a "\t", 0, "\n", 0, "Undisclosed", b, 0, NULL, NULL); \
+			"\n" a ":", 0, "\n", 0, "Undisclosed", b, 0, NULL, NULL); \
 	if (found) \
 		sect_info = TRUE;
 
@@ -1469,6 +1469,8 @@
 		gaim_notify_userinfo(info_data->gc, info_data->name, buf, NULL, NULL);
 
 		g_free(tooltip_text);
+		g_free(info_data->name);
+		g_free(info_data);
 		return;
 	}
 
@@ -1599,6 +1601,7 @@
 		personal = g_strdup_printf(_("<br><b>Personal</b><br>%s"), s->str);
 		s = g_string_truncate(s, 0);
 		sect_info = FALSE;
+		has_info = TRUE;
 	}
 
 	/* Business */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17073] trunk/libgaim/plugins/Makefile.mingw

[<dat...@us...>]

Revision: 17073
Author:   datallah
Date:     2006-08-28 18:00:18 -0700 (Mon, 28 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17073&view=rev

Log Message:
-----------
Re-enable the perl plugin building for wingaim

Modified Paths:
--------------
    trunk/libgaim/plugins/Makefile.mingw
Modified: trunk/libgaim/plugins/Makefile.mingw
===================================================================
--- trunk/libgaim/plugins/Makefile.mingw	2006-08-28 23:31:12 UTC (rev 17072)
+++ trunk/libgaim/plugins/Makefile.mingw	2006-08-29 01:00:18 UTC (rev 17073)
@@ -45,12 +45,12 @@
 .PHONY: all clean
 
 all: $(GAIM_LIBGAIM_DLL).a plugins
-#	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
+	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
 	$(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
 	$(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE)
 
 install: all $(GAIM_INSTALL_PLUGINS_DIR)
-#	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
+	$(MAKE) -C $(PERL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(TCL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
 	$(MAKE) -C $(SSL_PLUGIN) -f $(GAIM_WIN32_MAKEFILE) install
 	cp $(GAIM_LIB_PLUGINS_TOP)/*.dll $(GAIM_INSTALL_PLUGINS_DIR)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.