pidgin-commits Mailing List for Pidgin IM (Page 28)

A universal instant messaging (IM) program

Brought to you by: amc_grim, bigbrownchunx, qulogic, rekkanoryo, rlaager

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

You can subscribe to this list here.

2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (106)	Oct (334)	Nov (246)	Dec (145)
2002	Jan (42)	Feb (53)	Mar (232)	Apr (109)	May (137)	Jun (63)	Jul (26)	Aug (263)	Sep (193)	Oct (507)	Nov (440)	Dec (241)
2003	Jan (567)	Feb (195)	Mar (504)	Apr (481)	May (524)	Jun (522)	Jul (594)	Aug (502)	Sep (643)	Oct (508)	Nov (430)	Dec (377)
2004	Jan (361)	Feb (251)	Mar (219)	Apr (499)	May (461)	Jun (419)	Jul (314)	Aug (519)	Sep (416)	Oct (247)	Nov (305)	Dec (382)
2005	Jan (267)	Feb (282)	Mar (327)	Apr (338)	May (189)	Jun (400)	Jul (462)	Aug (530)	Sep (316)	Oct (523)	Nov (481)	Dec (650)
2006	Jan (536)	Feb (361)	Mar (287)	Apr (146)	May (101)	Jun (169)	Jul (221)	Aug (498)	Sep (300)	Oct (236)	Nov (209)	Dec (205)
2007	Jan (30)	Feb (23)	Mar (26)	Apr (15)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 26 27 28 29 30 .. 860 > >> (Page 28 of 860)

[Gaim-commits] SF.net SVN: gaim: [17475] trunk/gtk/gtkconv.c

From: <sea...@us...> - 2006-10-13 00:37:48

Revision: 17475
          http://svn.sourceforge.net/gaim/?rev=17475&view=rev
Author:   seanegan
Date:     2006-10-12 17:37:44 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
Middle-click closes tabs. It's requested enough, and I can't think of any reason *not* to do it

Modified Paths:
--------------
    trunk/gtk/gtkconv.c

Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c	2006-10-13 00:28:18 UTC (rev 17474)
+++ trunk/gtk/gtkconv.c	2006-10-13 00:37:44 UTC (rev 17475)
@@ -7082,6 +7082,19 @@
 	GtkWidget *page;
 	GtkWidget *tab;
 
+	if (e->button == 2) {
+		GaimGtkConversation *gtkconv;
+		tab_clicked = gaim_gtkconv_get_tab_at_xy(win, e->x_root, e->y_root, NULL);
+
+		if (tab_clicked == -1)
+			return FALSE;
+		
+		gtkconv = gaim_gtk_conv_window_get_gtkconv_at_index(win, tab_clicked);
+		close_conv_cb(NULL, gtkconv);
+		return TRUE;
+	}
+
+
 	if (e->button != 1 || e->type != GDK_BUTTON_PRESS)
 		return 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: [17474] trunk/libgaim

From: <de...@us...> - 2006-10-13 00:28:23

Revision: 17474
          http://svn.sourceforge.net/gaim/?rev=17474&view=rev
Author:   deryni9
Date:     2006-10-12 17:28:18 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
As far as I can tell GaimStringFormatType is only used by the pluginpref api
and was added as part of a change to the pluginpref stuff, so why it was put
in prefs.h I'm not sure, pluginpref.h seems like a better place to me.

Modified Paths:
--------------
    trunk/libgaim/pluginpref.h
    trunk/libgaim/prefs.h

Modified: trunk/libgaim/pluginpref.h
===================================================================
--- trunk/libgaim/pluginpref.h	2006-10-13 00:26:54 UTC (rev 17473)
+++ trunk/libgaim/pluginpref.h	2006-10-13 00:28:18 UTC (rev 17474)
@@ -29,6 +29,16 @@
 typedef struct _GaimPluginPrefFrame		GaimPluginPrefFrame;
 typedef struct _GaimPluginPref			GaimPluginPref;
 
+/**
+ * String format for preferences.
+ */
+typedef enum
+{
+	GAIM_STRING_FORMAT_TYPE_NONE      = 0,
+	GAIM_STRING_FORMAT_TYPE_MULTILINE = 1 << 0,
+	GAIM_STRING_FORMAT_TYPE_HTML      = 1 << 1
+} GaimStringFormatType;
+
 typedef enum {
 	GAIM_PLUGIN_PREF_NONE,
 	GAIM_PLUGIN_PREF_CHOICE,

Modified: trunk/libgaim/prefs.h
===================================================================
--- trunk/libgaim/prefs.h	2006-10-13 00:26:54 UTC (rev 17473)
+++ trunk/libgaim/prefs.h	2006-10-13 00:28:18 UTC (rev 17474)
@@ -29,16 +29,6 @@
 #include <glib.h>
 
 /**
- * String format for preferences.
- */
-typedef enum
-{
-	GAIM_STRING_FORMAT_TYPE_NONE      = 0,
-	GAIM_STRING_FORMAT_TYPE_MULTILINE = 1 << 0,
-	GAIM_STRING_FORMAT_TYPE_HTML      = 1 << 1
-} GaimStringFormatType;
-
-/**
  * Pref data types.
  */
 typedef enum _GaimPrefType


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

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

From: <de...@us...> - 2006-10-13 00:27:02

Revision: 17473
          http://svn.sourceforge.net/gaim/?rev=17473&view=rev
Author:   deryni9
Date:     2006-10-12 17:26:54 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
Fix some whitespace, some mine from one of the back before I was a developer,
and some I have no real idea how it happened.

Also add my IRC nick to the manpage, it seems to be a common thing.

Modified Paths:
--------------
    trunk/doc/gaim.1.in
    trunk/gtk/gtkutils.c
    trunk/libgaim/mime.c

Modified: trunk/doc/gaim.1.in
===================================================================
--- trunk/doc/gaim.1.in	2006-10-12 23:25:36 UTC (rev 17472)
+++ trunk/doc/gaim.1.in	2006-10-13 00:26:54 UTC (rev 17473)
@@ -552,7 +552,7 @@
 .br
  Christopher 'siege' O'Brien
 .br
- Etan Reisner
+ Etan 'deryni' Reisner
 .br
  Tim 'marv' Ringenbach <\fIm...@us...\fR>
 .br

Modified: trunk/gtk/gtkutils.c
===================================================================
--- trunk/gtk/gtkutils.c	2006-10-12 23:25:36 UTC (rev 17472)
+++ trunk/gtk/gtkutils.c	2006-10-13 00:26:54 UTC (rev 17473)
@@ -847,13 +847,15 @@
 
 void
 gaim_gtk_save_accels_cb(GtkAccelGroup *accel_group, guint arg1,
-														 GdkModifierType arg2, GClosure *arg3,
-														 gpointer data)
+                         GdkModifierType arg2, GClosure *arg3,
+                         gpointer data)
 {
-	gaim_debug(GAIM_DEBUG_MISC, "accels", "accel changed, scheduling save.\n");
+	gaim_debug(GAIM_DEBUG_MISC, "accels",
+	           "accel changed, scheduling save.\n");
 
 	if (!accels_save_timer)
-		accels_save_timer = g_timeout_add(5000, gaim_gtk_save_accels, NULL);
+		accels_save_timer = g_timeout_add(5000, gaim_gtk_save_accels,
+		                                  NULL);
 }
 
 gboolean
@@ -862,7 +864,7 @@
 	char *filename = NULL;
 
 	filename = g_build_filename(gaim_user_dir(), G_DIR_SEPARATOR_S,
-															"accels", NULL);
+	                            "accels", NULL);
 	gaim_debug(GAIM_DEBUG_MISC, "accels", "saving accels to %s\n", filename);
 	gtk_accel_map_save(filename);
 	g_free(filename);
@@ -877,7 +879,7 @@
 	char *filename = NULL;
 
 	filename = g_build_filename(gaim_user_dir(), G_DIR_SEPARATOR_S,
-															"accels", NULL);
+	                            "accels", NULL);
 	gtk_accel_map_load(filename);
 	g_free(filename);
 }

Modified: trunk/libgaim/mime.c
===================================================================
--- trunk/libgaim/mime.c	2006-10-12 23:25:36 UTC (rev 17472)
+++ trunk/libgaim/mime.c	2006-10-13 00:26:54 UTC (rev 17473)
@@ -352,7 +352,7 @@
 		*data = gaim_base16_decode(part->data->str, len);
 
 	} else if(! g_ascii_strcasecmp(enc, "base64")) {
-	*data = gaim_base64_decode(part->data->str, len);
+		*data = gaim_base64_decode(part->data->str, len);
 
 	} else if(! g_ascii_strcasecmp(enc, "quoted-printable")) {
 		*data = gaim_quotedp_decode(part->data->str, len);


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

[Gaim-commits] SF.net SVN: gaim: [17472] trunk/gtk/plugins/perl/common

From: <de...@us...> - 2006-10-12 23:25:46

Revision: 17472
          http://svn.sourceforge.net/gaim/?rev=17472&view=rev
Author:   deryni9
Date:     2006-10-12 16:25:36 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
Changing void * to Gaim::Handle in gtkperl as well.

Modified Paths:
--------------
    trunk/gtk/plugins/perl/common/GtkAccount.xs
    trunk/gtk/plugins/perl/common/GtkBlist.xs
    trunk/gtk/plugins/perl/common/GtkConn.xs
    trunk/gtk/plugins/perl/common/GtkConv.xs
    trunk/gtk/plugins/perl/common/GtkDebug.xs
    trunk/gtk/plugins/perl/common/GtkLog.xs
    trunk/gtk/plugins/perl/common/GtkPounce.xs
    trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs
    trunk/gtk/plugins/perl/common/GtkSound.xs

Modified: trunk/gtk/plugins/perl/common/GtkAccount.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkAccount.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkAccount.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -3,7 +3,7 @@
 MODULE = Gaim::GtkUI::Account  PACKAGE = Gaim::GtkUI::Account  PREFIX = gaim_gtk_account_
 PROTOTYPES: ENABLE
 
-void *
+Gaim::Handle
 gaim_gtk_account_get_handle()
 
 MODULE = Gaim::GtkUI::Account  PACKAGE = Gaim::GtkUI::Account::Dialog  PREFIX = gaim_gtk_account_dialog_

Modified: trunk/gtk/plugins/perl/common/GtkBlist.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkBlist.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkBlist.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -3,7 +3,7 @@
 MODULE = Gaim::GtkUI::BuddyList  PACKAGE = Gaim::GtkUI::BuddyList  PREFIX = gaim_gtk_blist_
 PROTOTYPES: ENABLE
 
-void *
+Gaim::Handle
 gaim_gtk_blist_get_handle()
 
 Gaim::GtkUI::BuddyList

Modified: trunk/gtk/plugins/perl/common/GtkConn.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkConn.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkConn.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -3,5 +3,5 @@
 MODULE = Gaim::GtkUI::Connection  PACKAGE = Gaim::GtkUI::Connection  PREFIX = gaim_gtk_connection_
 PROTOTYPES: ENABLE
 
-void *
+Gaim::Handle
 gaim_gtk_connection_get_handle()

Modified: trunk/gtk/plugins/perl/common/GtkConv.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkConv.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkConv.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -43,5 +43,5 @@
 	gboolean hidden_only
 	guint max_count
 
-void *
+Gaim::Handle
 gaim_gtk_conversations_get_handle()

Modified: trunk/gtk/plugins/perl/common/GtkDebug.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkDebug.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkDebug.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -3,7 +3,7 @@
 MODULE = Gaim::GtkUI::Debug  PACKAGE = Gaim::GtkUI::Debug  PREFIX = gaim_gtk_debug_
 PROTOTYPES: ENABLE
 
-void *
+Gaim::Handle
 gaim_gtk_debug_get_handle()
 
 MODULE = Gaim::GtkUI::Debug  PACKAGE = Gaim::GtkUI::Debug::Window  PREFIX = gaim_gtk_debug_window_

Modified: trunk/gtk/plugins/perl/common/GtkLog.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkLog.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkLog.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -3,7 +3,7 @@
 MODULE = Gaim::GtkUI::Log  PACKAGE = Gaim::GtkUI::Log  PREFIX = gaim_gtk_log_
 PROTOTYPES: ENABLE
 
-void *
+Gaim::Handle
 gaim_gtk_log_get_handle()
 
 void

Modified: trunk/gtk/plugins/perl/common/GtkPounce.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkPounce.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkPounce.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -12,7 +12,7 @@
 MODULE = Gaim::GtkUI::Pounce  PACKAGE = Gaim::GtkUI::Pounces  PREFIX = gaim_gtk_pounces_
 PROTOTYPES: ENABLE
 
-void *
+Gaim::Handle
 gaim_gtk_pounces_get_handle()
 
 MODULE = Gaim::GtkUI::Pounce  PACKAGE = Gaim::GtkUI::Pounces::Manager  PREFIX = gaim_gtk_pounces_manager_

Modified: trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkSavedStatuses.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -3,7 +3,7 @@
 MODULE = Gaim::GtkUI::Status  PACKAGE = Gaim::GtkUI::Status  PREFIX = gaim_gtk_status_
 PROTOTYPES: ENABLE
 
-void *
+Gaim::Handle
 gaim_gtk_status_get_handle()
 
 MODULE = Gaim::GtkUI::Status  PACKAGE = Gaim::GtkUI::Status::Editor  PREFIX = gaim_gtk_status_editor_

Modified: trunk/gtk/plugins/perl/common/GtkSound.xs
===================================================================
--- trunk/gtk/plugins/perl/common/GtkSound.xs	2006-10-12 20:38:47 UTC (rev 17471)
+++ trunk/gtk/plugins/perl/common/GtkSound.xs	2006-10-12 23:25:36 UTC (rev 17472)
@@ -11,5 +11,5 @@
 gaim_gtk_sound_get_event_label(event)
 	Gaim::SoundEventID event
 
-void *
+Gaim::Handle
 gaim_gtk_sound_get_handle()


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

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

From: <de...@us...> - 2006-10-12 20:39:04

Revision: 17471
          http://svn.sourceforge.net/gaim/?rev=17471&view=rev
Author:   deryni9
Date:     2006-10-12 13:38:47 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
Martijn van Beers provided some patches to rework the perl object
casting/blessing for signal instances in order to let the newly added jabber-*
signals work. This is those patches.
This is also a small whitespace change, a removal of the gaim debug message
about "Found plugin info" it was just pissing me off, and a renamespacing of
gaim_blist_node_get_extended_menu into Gaim::Blist::Node where it makes
slightly more sense.

Modified Paths:
--------------
    trunk/COPYRIGHT
    trunk/libgaim/plugins/perl/common/Account.xs
    trunk/libgaim/plugins/perl/common/BuddyIcon.xs
    trunk/libgaim/plugins/perl/common/BuddyList.xs
    trunk/libgaim/plugins/perl/common/Cipher.xs
    trunk/libgaim/plugins/perl/common/Connection.xs
    trunk/libgaim/plugins/perl/common/Conversation.xs
    trunk/libgaim/plugins/perl/common/Plugin.xs
    trunk/libgaim/plugins/perl/common/Pounce.xs
    trunk/libgaim/plugins/perl/common/Prefs.xs
    trunk/libgaim/plugins/perl/common/Proxy.xs
    trunk/libgaim/plugins/perl/common/SavedStatuses.xs
    trunk/libgaim/plugins/perl/common/Signal.xs
    trunk/libgaim/plugins/perl/common/Status.xs
    trunk/libgaim/plugins/perl/common/XMLNode.xs
    trunk/libgaim/plugins/perl/common/module.h
    trunk/libgaim/plugins/perl/common/typemap
    trunk/libgaim/plugins/perl/perl-common.c
    trunk/libgaim/plugins/perl/perl-handlers.c
    trunk/libgaim/plugins/perl/perl.c

Modified: trunk/COPYRIGHT
===================================================================
--- trunk/COPYRIGHT	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/COPYRIGHT	2006-10-12 20:38:47 UTC (rev 17471)
@@ -305,6 +305,7 @@
 Brad Turcotte
 Junichi Uekawa
 István Váradi
+Martijn van Beers
 Philip Van Hoof
 Kristof Vansant
 James Vega

Modified: trunk/libgaim/plugins/perl/common/Account.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Account.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Account.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -306,7 +306,7 @@
 Gaim::Account::UiOps
 gaim_accounts_get_ui_ops()
 
-void *
+Gaim::Handle
 gaim_accounts_get_handle()
 
 void

Modified: trunk/libgaim/plugins/perl/common/BuddyIcon.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/BuddyIcon.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/BuddyIcon.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -80,7 +80,7 @@
 const char *
 gaim_buddy_icons_get_cache_dir();
 
-void *
+Gaim::Handle
 gaim_buddy_icons_get_handle();
 
 void

Modified: trunk/libgaim/plugins/perl/common/BuddyList.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/BuddyList.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/BuddyList.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -216,23 +216,13 @@
 gaim_blist_request_add_group()
 
 void
-gaim_blist_node_get_extended_menu(node)
-	Gaim::BuddyList::Node node
-PREINIT:
-	GList *l;
-PPCODE:
-	for (l = gaim_blist_node_get_extended_menu(node); l != NULL; l = l->next) {
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Menu::Action")));
-	}
-
-void
 gaim_blist_set_ui_ops(ops)
 	Gaim::BuddyList::UiOps ops
 
 Gaim::BuddyList::UiOps
 gaim_blist_get_ui_ops()
 
-void *
+Gaim::Handle
 gaim_blist_get_handle()
 
 void
@@ -245,6 +235,16 @@
 PROTOTYPES: ENABLE
 
 void
+gaim_blist_node_get_extended_menu(node)
+	Gaim::BuddyList::Node node
+PREINIT:
+	GList *l;
+PPCODE:
+	for (l = gaim_blist_node_get_extended_menu(node); l != NULL; l = l->next) {
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Menu::Action")));
+	}
+
+void
 gaim_blist_node_set_bool(node, key, value)
 	Gaim::BuddyList::Node node
 	const char * key

Modified: trunk/libgaim/plugins/perl/common/Cipher.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Cipher.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Cipher.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -45,7 +45,7 @@
 		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Cipher")));
 	}
 
-gpointer
+Gaim::Handle
 gaim_ciphers_get_handle()
 
 void

Modified: trunk/libgaim/plugins/perl/common/Connection.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Connection.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Connection.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -85,5 +85,5 @@
 void
 gaim_connections_uninit()
 
-void *
+Gaim::Handle
 gaim_connections_get_handle()

Modified: trunk/libgaim/plugins/perl/common/Conversation.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Conversation.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Conversation.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -33,7 +33,7 @@
 MODULE = Gaim::Conversation  PACKAGE = Gaim::Conversations  PREFIX = gaim_conversations_
 PROTOTYPES: ENABLE
 
-void *
+Gaim::Handle
 gaim_conversations_get_handle()
 
 void

Modified: trunk/libgaim/plugins/perl/common/Plugin.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Plugin.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Plugin.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -146,7 +146,7 @@
 		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Plugin")));
 	}
 
-void *
+Gaim::Handle
 gaim_plugins_get_handle()
 
 void

Modified: trunk/libgaim/plugins/perl/common/Pounce.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Pounce.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Pounce.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -73,7 +73,7 @@
 		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::Pounce")));
 	}
 
-void *
+Gaim::Handle
 gaim_pounces_get_handle()
 
 void

Modified: trunk/libgaim/plugins/perl/common/Prefs.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Prefs.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Prefs.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -58,7 +58,7 @@
 gaim_prefs_get_bool(name)
 	const char *name
 
-void *
+Gaim::Handle
 gaim_prefs_get_handle()
 
 int

Modified: trunk/libgaim/plugins/perl/common/Proxy.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Proxy.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Proxy.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -6,7 +6,7 @@
 Gaim::ProxyInfo
 gaim_global_proxy_get_info()
 
-void *
+Gaim::Handle
 gaim_proxy_get_handle()
 
 void

Modified: trunk/libgaim/plugins/perl/common/SavedStatuses.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/SavedStatuses.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/SavedStatuses.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -48,7 +48,7 @@
 		XPUSHs(sv_2mortal(gaim_perl_bless_object(l->data, "Gaim::SavedStatus")));
 	}
 
-void *
+Gaim::Handle
 gaim_savedstatuses_get_handle()
 
 void

Modified: trunk/libgaim/plugins/perl/common/Signal.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Signal.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Signal.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -6,7 +6,7 @@
 
 void
 gaim_signal_connect_priority(instance, signal, plugin, callback, priority, data = 0)
-	void *instance
+	Gaim::Handle instance
 	const char *signal
 	Gaim::Plugin plugin
 	SV *callback
@@ -17,7 +17,7 @@
 
 void
 gaim_signal_connect(instance, signal, plugin, callback, data = 0)
-	void *instance
+	Gaim::Handle instance
 	const char *signal
 	Gaim::Plugin plugin
 	SV *callback
@@ -27,7 +27,7 @@
 
 void
 gaim_signal_disconnect(instance, signal, plugin)
-	void *instance
+	Gaim::Handle instance
 	const char *signal
 	Gaim::Plugin plugin
 CODE:

Modified: trunk/libgaim/plugins/perl/common/Status.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/Status.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/Status.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -263,7 +263,7 @@
 	Gaim::Status status
 	const char *id
 
-void *
+Gaim::Handle
 gaim_status_get_handle()
 
 const char *

Modified: trunk/libgaim/plugins/perl/common/XMLNode.xs
===================================================================
--- trunk/libgaim/plugins/perl/common/XMLNode.xs	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/XMLNode.xs	2006-10-12 20:38:47 UTC (rev 17471)
@@ -5,13 +5,13 @@
 
 Gaim::XMLNode
 xmlnode_copy(class, src)
-	xmlnode *src
+	Gaim::XMLNode src
     C_ARGS:
 	src
 
 void
 xmlnode_free(node)
-	xmlnode *node
+	Gaim::XMLNode node
 
 Gaim::XMLNode
 xmlnode_from_str(class, str, size)
@@ -22,36 +22,36 @@
 
 const char *
 xmlnode_get_attrib(node, attr)
-	xmlnode *node
+	Gaim::XMLNode node
 	const char *attr
 
 Gaim::XMLNode
 xmlnode_get_child(parent, name)
-	const xmlnode *parent
+	Gaim::XMLNode parent
 	const char *name
 
 Gaim::XMLNode
 xmlnode_get_child_with_namespace(parent, name, xmlns)
-	const xmlnode *parent
+	Gaim::XMLNode parent
 	const char *name
 	const char *xmlns
 
 char *
 xmlnode_get_data(node)
-	xmlnode *node
+	Gaim::XMLNode node
 
 Gaim::XMLNode
 xmlnode_get_next_twin(node)
-	xmlnode *node
+	Gaim::XMLNode node
 
 void
 xmlnode_insert_child(parent, child)
-	xmlnode *parent
-	xmlnode *child
+	Gaim::XMLNode parent
+	Gaim::XMLNode child
 
 void
 xmlnode_insert_data(node, data, size)
-	xmlnode *node
+	Gaim::XMLNode node
 	const char *data
 	gssize size
 
@@ -63,26 +63,26 @@
 
 Gaim::XMLNode
 xmlnode_new_child(parent, name)
-	xmlnode *parent
+	Gaim::XMLNode parent
 	const char *name
 
 void
 xmlnode_remove_attrib(node, attr)
-	xmlnode *node
+	Gaim::XMLNode node
 	const char *attr
 
 void
 xmlnode_set_attrib(node, attr, value)
-	xmlnode *node
+	Gaim::XMLNode node
 	const char *attr
 	const char *value
 
 char *
 xmlnode_to_formatted_str(node, len)
-	xmlnode *node
+	Gaim::XMLNode node
 	int *len
 
 char *
 xmlnode_to_str(node, len)
-	xmlnode *node
+	Gaim::XMLNode node
 	int *len

Modified: trunk/libgaim/plugins/perl/common/module.h
===================================================================
--- trunk/libgaim/plugins/perl/common/module.h	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/module.h	2006-10-12 20:38:47 UTC (rev 17471)
@@ -263,4 +263,5 @@
 typedef xmlnode *			Gaim__XMLNode;
 typedef XMLNodeType			XMLNode__Type;
 
-/* other.h */
+/* other */
+typedef void *				Gaim__Handle;

Modified: trunk/libgaim/plugins/perl/common/typemap
===================================================================
--- trunk/libgaim/plugins/perl/common/typemap	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/common/typemap	2006-10-12 20:38:47 UTC (rev 17471)
@@ -72,6 +72,8 @@
 Gaim::Desktop::Item			T_GaimObj
 Gaim::DesktopItemType			T_IV
 
+Gaim::Handle				T_GaimObj
+
 Gaim::IconScaleRules			T_IV
 
 Gaim::Log				T_GaimObj

Modified: trunk/libgaim/plugins/perl/perl-common.c
===================================================================
--- trunk/libgaim/plugins/perl/perl-common.c	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/perl-common.c	2006-10-12 20:38:47 UTC (rev 17471)
@@ -447,6 +447,9 @@
 		case GAIM_SUBTYPE_XFER:
 			stash = "Gaim::Xfer";
 			break;
+		case GAIM_SUBTYPE_XMLNODE:
+			stash = "Gaim::XMLNode";
+			break;
 
 		default:
 			stash = "Gaim"; /* ? */

Modified: trunk/libgaim/plugins/perl/perl-handlers.c
===================================================================
--- trunk/libgaim/plugins/perl/perl-handlers.c	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/perl-handlers.c	2006-10-12 20:38:47 UTC (rev 17471)
@@ -71,7 +71,8 @@
 	/* XXX This *will* cease working correctly if context gets changed to
 	 * ever be able to hold anything other than a GaimConnection */
 	if (context != NULL)
-		XPUSHs(sv_2mortal(gaim_perl_bless_object(context, "Gaim::Connection")));
+		XPUSHs(sv_2mortal(gaim_perl_bless_object(context,
+		                                         "Gaim::Connection")));
 	else
 		XPUSHs(&PL_sv_undef);
 	PUTBACK;

Modified: trunk/libgaim/plugins/perl/perl.c
===================================================================
--- trunk/libgaim/plugins/perl/perl.c	2006-10-12 13:42:11 UTC (rev 17470)
+++ trunk/libgaim/plugins/perl/perl.c	2006-10-12 20:38:47 UTC (rev 17471)
@@ -276,9 +276,6 @@
 			char *basename;
 			STRLEN len;
 
-			gaim_debug(GAIM_DEBUG_INFO, "perl",
-			           "Found plugin info\n");
-
 			info = g_new0(GaimPluginInfo, 1);
 			gps  = g_new0(GaimPerlScript, 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: [17470] trunk/gtk/plugins/notify.c

From: <de...@us...> - 2006-10-12 13:42:18

Revision: 17470
          http://svn.sourceforge.net/gaim/?rev=17470&view=rev
Author:   deryni9
Date:     2006-10-12 06:42:11 -0700 (Thu, 12 Oct 2006)

Log Message:
-----------
Apparently a bunch of Ubuntu users weren't bothering to look at the
configuration options for this plugin and were filing bugs about the window
continuing to flash after being clicked on. This should help fix that.

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

Modified: trunk/gtk/plugins/notify.c
===================================================================
--- trunk/gtk/plugins/notify.c	2006-10-12 05:29:08 UTC (rev 17469)
+++ trunk/gtk/plugins/notify.c	2006-10-12 13:42:11 UTC (rev 17470)
@@ -944,7 +944,7 @@
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/method_count", FALSE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/method_count_xprop", FALSE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/method_raise", FALSE);
-	gaim_prefs_add_bool("/plugins/gtk/X11/notify/notify_focus", FALSE);
+	gaim_prefs_add_bool("/plugins/gtk/X11/notify/notify_focus", TRUE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/notify_click", FALSE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/notify_type", TRUE);
 	gaim_prefs_add_bool("/plugins/gtk/X11/notify/notify_send", 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: [17469] trunk/console

From: <sa...@us...> - 2006-10-12 05:29:20

Revision: 17469
          http://svn.sourceforge.net/gaim/?rev=17469&view=rev
Author:   sadrul
Date:     2006-10-11 22:29:08 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Add a lastlog plugin for gaim-text.

Modified Paths:
--------------
    trunk/console/gntconv.c
    trunk/console/gntconv.h
    trunk/console/plugins/Makefile.am

Added Paths:
-----------
    trunk/console/plugins/lastlog.c

Modified: trunk/console/gntconv.c
===================================================================
--- trunk/console/gntconv.c	2006-10-12 03:33:07 UTC (rev 17468)
+++ trunk/console/gntconv.c	2006-10-12 05:29:08 UTC (rev 17469)
@@ -46,37 +46,6 @@
 
 #include "config.h"
 
-typedef struct _GGConv GGConv;
-typedef struct _GGConvChat GGConvChat;
-typedef struct _GGConvIm GGConvIm;
-
-struct _GGConv
-{
-	GList *list;
-	GaimConversation *active_conv;
-	/*GaimConversation *conv;*/
-
-	GntWidget *window;        /* the container */
-	GntWidget *entry;         /* entry */
-	GntWidget *tv;            /* text-view */
-
-	union
-	{
-		GGConvChat *chat;
-		GGConvIm *im;
-	} u;
-};
-
-struct _GGConvChat
-{
-	GntWidget *userlist;       /* the userlist */
-};
-
-struct _GGConvIm
-{
-	void *nothing_for_now;
-};
-
 static gboolean
 entry_key_pressed(GntWidget *w, const char *key, GGConv *ggconv)
 {
@@ -362,7 +331,7 @@
 
 	pos = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggconv->tv));
 
-	gnt_text_view_next_line(GNT_TEXT_VIEW(ggconv->tv));
+	gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(ggconv->tv), "\n", GNT_TEXT_FLAG_NORMAL);
 
 	/* Unnecessary to print the timestamp for delayed message */
 	if (!(flags & GAIM_MESSAGE_DELAYED) &&

Modified: trunk/console/gntconv.h
===================================================================
--- trunk/console/gntconv.h	2006-10-12 03:33:07 UTC (rev 17468)
+++ trunk/console/gntconv.h	2006-10-12 05:29:08 UTC (rev 17469)
@@ -25,6 +25,9 @@
 #ifndef _GNT_CONV_H
 #define _GNT_CONV_H
 
+#include <gnt.h>
+#include <gntwidget.h>
+
 #include "conversation.h"
 
 /***************************************************************************
@@ -32,6 +35,36 @@
  ***************************************************************************/
 /*@{*/
 
+typedef struct _GGConv GGConv;
+typedef struct _GGConvChat GGConvChat;
+typedef struct _GGConvIm GGConvIm;
+
+struct _GGConv
+{
+	GList *list;
+	GaimConversation *active_conv;
+
+	GntWidget *window;        /* the container */
+	GntWidget *entry;         /* entry */
+	GntWidget *tv;            /* text-view */
+
+	union
+	{
+		GGConvChat *chat;
+		GGConvIm *im;
+	} u;
+};
+
+struct _GGConvChat
+{
+	GntWidget *userlist;       /* the userlist */
+};
+
+struct _GGConvIm
+{
+	void *nothing_for_now;
+};
+
 /**
  * Get the ui-functions.
  *

Modified: trunk/console/plugins/Makefile.am
===================================================================
--- trunk/console/plugins/Makefile.am	2006-10-12 03:33:07 UTC (rev 17468)
+++ trunk/console/plugins/Makefile.am	2006-10-12 05:29:08 UTC (rev 17469)
@@ -1,19 +1,23 @@
 gntgf_la_LDFLAGS      = -module -avoid-version
 gnthistory_la_LDFLAGS = -module -avoid-version
+gntlastlog_la_LDFLAGS    = -module -avoid-version
 
 if PLUGINS
 
 plugin_LTLIBRARIES = \
 	gntgf.la \
-	gnthistory.la
+	gnthistory.la \
+	gntlastlog.la
 
 plugindir = $(libdir)/gaim
 
 gntgf_la_SOURCES      = gntgf.c
 gnthistory_la_SOURCES = gnthistory.c
+gntlastlog_la_SOURCES    = lastlog.c
 
 gntgf_la_LIBADD       = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/console/libgnt/libgnt.la
 gnthistory_la_LIBADD  = $(GLIB_LIBS)
+gntlastlog_la_LIBADD  = $(GLIB_LIBS)
 
 endif # PLUGINS
 

Added: trunk/console/plugins/lastlog.c
===================================================================
--- trunk/console/plugins/lastlog.c	                        (rev 0)
+++ trunk/console/plugins/lastlog.c	2006-10-12 05:29:08 UTC (rev 17469)
@@ -0,0 +1,142 @@
+/**
+ * @file lastlog.c Lastlog plugin for gaim-text.
+ *
+ * Copyright (C) 2006 Sadrul Habib Chowdhury <sa...@us...>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#define PLUGIN_STATIC_NAME	"GntLastlog"
+
+#include "internal.h"
+
+#include <plugin.h>
+#include <version.h>
+
+#include <cmds.h>
+
+#include <gnt.h>
+#include <gnttextview.h>
+#include <gntwindow.h>
+
+#include <gntconv.h>
+#include <gntplugin.h>
+
+static GaimCmdId cmd;
+
+static gboolean
+window_kpress_cb(GntWidget *wid, const char *key, GntTextView *view)
+{
+	if (key[0] == 27)
+	{
+		if (strcmp(key+1, GNT_KEY_DOWN) == 0)
+			gnt_text_view_scroll(view, 1);
+		else if (strcmp(key+1, GNT_KEY_UP) == 0)
+			gnt_text_view_scroll(view, -1);
+		else if (strcmp(key+1, GNT_KEY_PGDOWN) == 0)
+			gnt_text_view_scroll(view, wid->priv.height - 2);
+		else if (strcmp(key+1, GNT_KEY_PGUP) == 0)
+			gnt_text_view_scroll(view, -(wid->priv.height - 2));
+		else
+			return FALSE;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static GaimCmdRet
+lastlog_cb(GaimConversation *conv, const char *cmd, char **args, char **error, gpointer null)
+{
+	GGConv *ggconv = conv->ui_data;
+	char **strings = g_strsplit(GNT_TEXT_VIEW(ggconv->tv)->string->str, "\n", 0);
+	GntWidget *win, *tv;
+	int i, j;
+
+	win = gnt_window_new();
+	gnt_box_set_title(GNT_BOX(win), _("Lastlog"));
+
+	tv = gnt_text_view_new();
+	gnt_box_add_widget(GNT_BOX(win), tv);
+
+	gnt_widget_show(win);
+
+	for (i = 0; strings[i]; i++) {
+		if (strstr(strings[i], args[0]) != NULL) {
+			char **finds = g_strsplit(strings[i], args[0], 0);
+			for (j = 0; finds[j]; j++) {
+				if (j)
+					gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(tv), args[0], GNT_TEXT_FLAG_BOLD);
+				gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(tv), finds[j], GNT_TEXT_FLAG_NORMAL);
+			}
+			g_strfreev(finds);
+			gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(tv), "\n", GNT_TEXT_FLAG_NORMAL);
+		}
+	}
+
+	g_signal_connect(G_OBJECT(win), "key_pressed", G_CALLBACK(window_kpress_cb), tv);
+	g_strfreev(strings);
+	return GAIM_CMD_STATUS_OK;
+}
+
+static gboolean
+plugin_load(GaimPlugin *plugin)
+{
+	cmd = gaim_cmd_register("lastlog", "s", GAIM_CMD_P_DEFAULT,
+			GAIM_CMD_FLAG_CHAT | GAIM_CMD_FLAG_IM, NULL,
+			lastlog_cb, _("lastlog: Searches for a substring in the backlog."), NULL);
+	return TRUE;
+}
+
+static gboolean
+plugin_unload(GaimPlugin *plugin)
+{
+	gaim_cmd_unregister(cmd);
+	return TRUE;
+}
+
+static GaimPluginInfo info =
+{
+	GAIM_PLUGIN_MAGIC,
+	GAIM_MAJOR_VERSION,
+	GAIM_MINOR_VERSION,
+	GAIM_PLUGIN_STANDARD,
+	GAIM_GNT_PLUGIN_TYPE,
+	0,
+	NULL,
+	GAIM_PRIORITY_DEFAULT,
+	"gntlastlog",
+	N_("GntLastlog"),
+	VERSION,
+	N_("Lastlog plugin for gaim-text."),
+	N_("Lastlog plugin for gaim-text."),
+	"Sadrul H Chowdhury <sa...@us...>",
+	"http://gaim.sourceforge.net",
+	plugin_load,
+	plugin_unload,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_plugin(GaimPlugin *plugin)
+{
+}
+
+GAIM_INIT_PLUGIN(PLUGIN_STATIC_NAME, init_plugin, info)
+


Property changes on: trunk/console/plugins/lastlog.c
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


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

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

From: <sa...@us...> - 2006-10-12 03:33:14

Revision: 17468
          http://svn.sourceforge.net/gaim/?rev=17468&view=rev
Author:   sadrul
Date:     2006-10-11 20:33:07 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Make sure things don't go crazy when you add text to a textview which is yet to
be given a size.

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

Modified: trunk/console/libgnt/gntutils.c
===================================================================
--- trunk/console/libgnt/gntutils.c	2006-10-12 03:30:25 UTC (rev 17467)
+++ trunk/console/libgnt/gntutils.c	2006-10-12 03:33:07 UTC (rev 17468)
@@ -59,6 +59,10 @@
 	int width = 0;
 	const char *str = string;
 
+	if (len <= 0) {
+		len = g_utf8_strlen(string, -1);
+	}
+
 	while (width < len && *str) {
 		size = g_unichar_iswide(g_utf8_get_char(str)) ? 2 : 1;
 		if (width + size > len)


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

[Gaim-commits] SF.net SVN: gaim: [17467] trunk/console/gntdebug.c

From: <sa...@us...> - 2006-10-12 03:30:32

Revision: 17467
          http://svn.sourceforge.net/gaim/?rev=17467&view=rev
Author:   sadrul
Date:     2006-10-11 20:30:25 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Yet another patch from Richard Nelson (wabz). This makes the checkboxes in the
debug window vertically centered.

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

Modified: trunk/console/gntdebug.c
===================================================================
--- trunk/console/gntdebug.c	2006-10-12 03:26:33 UTC (rev 17466)
+++ trunk/console/gntdebug.c	2006-10-12 03:30:25 UTC (rev 17467)
@@ -211,6 +211,7 @@
 
 		box = gnt_hbox_new(FALSE);
 		gnt_box_set_alignment(GNT_BOX(box), GNT_ALIGN_MID);
+		gnt_box_set_fill(GNT_BOX(box), FALSE);
 
 		/* XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
 		 * it's necessary to make the width of the debug window resizable ... like I said,


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

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

From: <sa...@us...> - 2006-10-12 03:26:39

Revision: 17466
          http://svn.sourceforge.net/gaim/?rev=17466&view=rev
Author:   sadrul
Date:     2006-10-11 20:26:33 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Patch #1573404 from Richard Nelson (wabz):
"This patch keeps the blist sorted (sorts rows at the
current depth when the text for a given row changes).
Adds a menu "Options" to the blist and adds the options
to sort by status, alphabetically and toggle offline
buddies."
I changed some of the stuff from the patch. Hopefully I didn't break anything.
I also added a "Sort by log size" option.

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-10-12 02:51:52 UTC (rev 17465)
+++ trunk/console/gntblist.c	2006-10-12 03:26:33 UTC (rev 17466)
@@ -99,6 +99,11 @@
 static const char * get_display_name(GaimBlistNode *node);
 static void savedstatus_changed(GaimSavedStatus *now, GaimSavedStatus *old);
 
+/* Sort functions */
+static int blist_node_compare_text(GaimBlistNode *n1, GaimBlistNode *n2);
+static int blist_node_compare_status(GaimBlistNode *n1, GaimBlistNode *n2);
+static int blist_node_compare_log(GaimBlistNode *n1, GaimBlistNode *n2);
+
 static gboolean
 is_contact_online(GaimContact *contact)
 {
@@ -188,6 +193,7 @@
 	if (node->ui_data != NULL) {
 		gnt_tree_change_text(GNT_TREE(ggblist->tree), node,
 				0, get_display_name(node));
+		gnt_tree_sort_row(GNT_TREE(ggblist->tree), node);
 	}
 
 	if (GAIM_BLIST_NODE_IS_BUDDY(node)) {
@@ -1375,6 +1381,17 @@
 	GaimBlistNode *node;
 	GaimBuddyList *list;
 
+	if (strcmp(gaim_prefs_get_string(PREF_ROOT "/sort_type"), "text") == 0) {
+		gnt_tree_set_compare_func(GNT_TREE(ggblist->tree),
+			(GCompareFunc)blist_node_compare_text);
+	} else if (strcmp(gaim_prefs_get_string(PREF_ROOT "/sort_type"), "status") == 0) {
+		gnt_tree_set_compare_func(GNT_TREE(ggblist->tree),
+			(GCompareFunc)blist_node_compare_status);
+	} else if (strcmp(gaim_prefs_get_string(PREF_ROOT "/sort_type"), "log") == 0) {
+		gnt_tree_set_compare_func(GNT_TREE(ggblist->tree),
+			(GCompareFunc)blist_node_compare_log);
+	}
+	
 	list = gaim_get_blist();
 	node = gaim_blist_get_root();
 	while (node)
@@ -1475,11 +1492,14 @@
 	gaim_prefs_add_int(PREF_ROOT "/position/y", 0);
 	gaim_prefs_add_bool(PREF_ROOT "/idletime", TRUE);
 	gaim_prefs_add_bool(PREF_ROOT "/showoffline", FALSE);
+	gaim_prefs_add_string(PREF_ROOT "/sort_type", "text");
 
 	gg_blist_show();
 
 	gaim_prefs_connect_callback(gg_blist_get_handle(),
 			PREF_ROOT "/showoffline", redraw_blist, NULL);
+	gaim_prefs_connect_callback(gg_blist_get_handle(),
+			PREF_ROOT "/sort_type", redraw_blist, NULL);
 
 	return;
 }
@@ -1621,7 +1641,7 @@
 }
 
 static int
-blist_node_compare(GaimBlistNode *n1, GaimBlistNode *n2)
+blist_node_compare_text(GaimBlistNode *n1, GaimBlistNode *n2)
 {
 	const char *s1, *s2;
 	char *us1, *us2;
@@ -1640,7 +1660,6 @@
 			s2 = gaim_chat_get_name((GaimChat*)n2);
 			break;
 		case GAIM_BLIST_BUDDY_NODE:
-			/* 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;
@@ -1661,6 +1680,77 @@
 	return ret;
 }
 
+static int
+blist_node_compare_status(GaimBlistNode *n1, GaimBlistNode *n2)
+{
+	int ret;
+
+	g_return_val_if_fail(n1->type == n2->type, -1);
+
+	switch (n1->type) {
+		case GAIM_BLIST_CONTACT_NODE:
+			n1 = (GaimBlistNode*)gaim_contact_get_priority_buddy((GaimContact*)n1);
+			n2 = (GaimBlistNode*)gaim_contact_get_priority_buddy((GaimContact*)n2);
+			/* now compare the presence of the priority buddies */
+		case GAIM_BLIST_BUDDY_NODE:
+			ret = gaim_presence_compare(gaim_buddy_get_presence((GaimBuddy*)n1),
+					gaim_buddy_get_presence((GaimBuddy*)n2));
+			if (ret != 0)
+				return ret;
+			break;
+		default:
+			break;
+	}
+
+	/* Sort alphabetically if presence is not comparable */
+	ret = blist_node_compare_text(n1, n2);
+
+	return ret;
+}
+
+static int
+get_contact_log_size(GaimBlistNode *c)
+{
+	int log = 0;
+	GaimBlistNode *node;
+
+	for (node = c->child; node; node = node->next) {
+		GaimBuddy *b = (GaimBuddy*)node;
+		log += gaim_log_get_total_size(GAIM_LOG_IM, b->name, b->account);
+	}
+
+	return log;
+}
+
+static int
+blist_node_compare_log(GaimBlistNode *n1, GaimBlistNode *n2)
+{
+	int ret;
+	GaimBuddy *b1, *b2;
+
+	g_return_val_if_fail(n1->type == n2->type, -1);
+
+	switch (n1->type) {
+		case GAIM_BLIST_BUDDY_NODE:
+			b1 = (GaimBuddy*)n1;
+			b2 = (GaimBuddy*)n2;
+			ret = gaim_log_get_total_size(GAIM_LOG_IM, b2->name, b2->account) - 
+					gaim_log_get_total_size(GAIM_LOG_IM, b1->name, b1->account);
+			if (ret != 0)
+				return ret;
+			break;
+		case GAIM_BLIST_CONTACT_NODE:
+			ret = get_contact_log_size(n2) - get_contact_log_size(n1);
+			if (ret != 0)
+				return ret;
+			break;
+		default:
+			break;
+	}
+	ret = blist_node_compare_text(n1, n2);
+	return ret;
+}
+
 static gboolean
 blist_clicked(GntTree *tree, GntMouseEvent event, int x, int y, gpointer ggblist)
 {
@@ -1678,27 +1768,19 @@
 		action->callback(action);
 }
 
-static void
-reconstruct_accounts_menu()
+static GntMenuItem *reconstruct_accounts_menu()
 {
-	GntWidget *menu, *sub;
-	GntMenuItem *item;
-	GntWindow *window;
+	GntWidget *sub;
+	GntMenuItem *acc, *item;
 	GList *iter;
 
 	if (!ggblist)
-		return;
+		return NULL;
 
-	window  = GNT_WINDOW(ggblist->window);
+	acc = gnt_menuitem_new(_("Accounts"));
 
-	menu = gnt_menu_new(GNT_MENU_TOPLEVEL);
-	gnt_window_set_menu(window, GNT_MENU(menu));
-
-	item = gnt_menuitem_new(_("Accounts"));
-	gnt_menu_add_item(GNT_MENU(menu), item);
-
 	sub = gnt_menu_new(GNT_MENU_POPUP);
-	gnt_menuitem_set_submenu(item, GNT_MENU(sub));
+	gnt_menuitem_set_submenu(acc, GNT_MENU(sub));
 
 	for (iter = gaim_accounts_get_all_active(); iter;
 			iter = g_list_delete_link(iter, iter)) {
@@ -1737,8 +1819,60 @@
 			}
 		}
 	}
+	return acc;
 }
 
+static void show_offline_cb(GntMenuItem *item, gpointer n)
+{
+	gaim_prefs_set_bool(PREF_ROOT "/showoffline",
+		!gaim_prefs_get_bool(PREF_ROOT "/showoffline"));
+}
+
+static void sort_blist_change_cb(GntMenuItem *item, gpointer n)
+{
+	gaim_prefs_set_string(PREF_ROOT "/sort_type", n);
+}
+
+static void
+create_menu()
+{
+	GntWidget *menu, *sub;
+	GntMenuItem *item;
+	GntWindow *window;
+
+	if (!ggblist)
+		return;
+
+	window = GNT_WINDOW(ggblist->window);
+	menu = gnt_menu_new(GNT_MENU_TOPLEVEL);
+	gnt_window_set_menu(window, GNT_MENU(menu));
+
+	item = gnt_menuitem_new(_("Options"));
+	gnt_menu_add_item(GNT_MENU(menu), item);
+
+	sub = gnt_menu_new(GNT_MENU_POPUP);
+	gnt_menuitem_set_submenu(item, GNT_MENU(sub));
+
+	item = gnt_menuitem_new(_("Toggle offline buddies"));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menuitem_set_callback(GNT_MENUITEM(item), show_offline_cb, NULL);
+
+	item = gnt_menuitem_new(_("Sort by status"));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menuitem_set_callback(GNT_MENUITEM(item), sort_blist_change_cb, "status");
+
+	item = gnt_menuitem_new(_("Sort alphabetically"));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menuitem_set_callback(GNT_MENUITEM(item), sort_blist_change_cb, "text");
+
+	item = gnt_menuitem_new(_("Sort by log size"));
+	gnt_menu_add_item(GNT_MENU(sub), item);
+	gnt_menuitem_set_callback(GNT_MENUITEM(item), sort_blist_change_cb, "log");
+
+	item = reconstruct_accounts_menu();
+	gnt_menu_add_item(GNT_MENU(menu), item);
+}
+
 void gg_blist_show()
 {
 	if (ggblist)
@@ -1755,7 +1889,7 @@
 	gnt_box_set_pad(GNT_BOX(ggblist->window), 0);
 
 	ggblist->tree = gnt_tree_new();
-	gnt_tree_set_compare_func(GNT_TREE(ggblist->tree), (GCompareFunc)blist_node_compare);
+
 	GNT_WIDGET_SET_FLAGS(ggblist->tree, GNT_WIDGET_NO_BORDER);
 	gnt_tree_set_col_width(GNT_TREE(ggblist->tree), 0, 25);
 	gnt_widget_set_size(ggblist->tree, gaim_prefs_get_int(PREF_ROOT "/size/width"),
@@ -1773,9 +1907,9 @@
 	gnt_widget_show(ggblist->window);
 
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-on", gg_blist_get_handle(),
-				GAIM_CALLBACK(reconstruct_accounts_menu), NULL);
+				GAIM_CALLBACK(create_menu), NULL);
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-off", gg_blist_get_handle(),
-				GAIM_CALLBACK(reconstruct_accounts_menu), NULL);
+				GAIM_CALLBACK(create_menu), NULL);
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-status-changed", gg_blist_get_handle(),
 				GAIM_CALLBACK(buddy_status_changed), ggblist);
 	gaim_signal_connect(gaim_blist_get_handle(), "buddy-idle-changed", gg_blist_get_handle(),
@@ -1817,7 +1951,7 @@
 	g_signal_connect(G_OBJECT(ggblist->statustext), "key_pressed",
 				G_CALLBACK(status_text_changed), NULL);
 
-	reconstruct_accounts_menu(ggblist);
+	create_menu();
 
 	populate_buddylist();
 

Modified: trunk/console/libgnt/gnttree.c
===================================================================
--- trunk/console/libgnt/gnttree.c	2006-10-12 02:51:52 UTC (rev 17465)
+++ trunk/console/libgnt/gnttree.c	2006-10-12 03:26:33 UTC (rev 17466)
@@ -45,6 +45,18 @@
 static GntWidgetClass *parent_class = NULL;
 static guint signals[SIGS] = { 0 };
 
+/* Move the item at position old to position new */
+static GList *
+g_list_reposition_child(GList *list, int old, int new)
+{
+	gpointer item = g_list_nth_data(list, old);
+	list = g_list_remove(list, item);
+	if (old < new)
+		new--;   /* because the positions would have shifted after removing the item */
+	list = g_list_insert(list, item, new);
+	return list;
+}
+
 static GntTreeRow *
 _get_next(GntTreeRow *row, gboolean godeep)
 {
@@ -837,6 +849,75 @@
 	return NULL;
 }
 
+void gnt_tree_sort_row(GntTree *tree, gpointer key)
+{
+	GntTreeRow *row, *q, *s;
+	int current, newp;
+
+	if (!tree->compare)
+		return;
+
+	row = g_hash_table_lookup(tree->hash, key);
+	g_return_if_fail(row != NULL);
+
+	current = g_list_index(tree->list, key);
+
+	if (row->parent)
+		s = row->parent->child;
+	else
+		s = tree->root;
+
+	q = NULL;
+	while (s) {
+		if (tree->compare(row->key, s->key) < 0)
+			break;
+		q = s;
+		s = s->next;
+	}
+
+	/* Move row between q and s */
+	if (row == q || row == s)
+		return;
+
+	if (q == NULL) {
+		/* row becomes the first child of its parent */
+		row->prev->next = row->next;  /* row->prev cannot be NULL at this point */
+		if (row->next)
+			row->next->prev = row->prev;
+		if (row->parent)
+			row->parent->child = row;
+		else
+			tree->root = row;
+		row->next = s;
+		s->prev = row;  /* s cannot be NULL */
+		row->prev = NULL;
+		newp = g_list_index(tree->list, s) - 1;
+	} else {
+		if (row->prev) {
+			row->prev->next = row->next;
+		} else {
+			/* row was the first child of its parent */
+			if (row->parent)
+				row->parent->child = row->next;
+			else
+				tree->top = row->next;
+		}
+
+		if (row->next)
+			row->next->prev = row->prev;
+
+		q->next = row;
+		row->prev = q;
+		if (s)
+			s->prev = row;
+		row->next = s;
+		newp = g_list_index(tree->list, q) + 1;
+	}
+	tree->list = g_list_reposition_child(tree->list, current, newp);
+
+	redraw_tree(tree);
+}
+
 GntTreeRow *gnt_tree_add_row_after(GntTree *tree, void *key, GntTreeRow *row, void *parent, void *bigbro)
 {
 	GntTreeRow *pr = NULL;

Modified: trunk/console/libgnt/gnttree.h
===================================================================
--- trunk/console/libgnt/gnttree.h	2006-10-12 02:51:52 UTC (rev 17465)
+++ trunk/console/libgnt/gnttree.h	2006-10-12 03:26:33 UTC (rev 17466)
@@ -123,6 +123,8 @@
 
 void gnt_tree_set_show_separator(GntTree *tree, gboolean set);
 
+void gnt_tree_sort_row(GntTree *tree, void *row);
+
 /* This will try to automatically adjust the width of the columns in the tree */
 void gnt_tree_adjust_columns(GntTree *tree);
 


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

[Gaim-commits] SF.net SVN: gaim: [17465] trunk/gaim.spec.in

From: <nos...@us...> - 2006-10-12 02:51:59

Revision: 17465
          http://svn.sourceforge.net/gaim/?rev=17465&view=rev
Author:   nosnilmot
Date:     2006-10-11 19:51:52 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
When installing libraries in system lib dirs, be sure to run ldconfig as required

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-10-12 01:08:28 UTC (rev 17464)
+++ trunk/gaim.spec.in	2006-10-12 02:51:52 UTC (rev 17465)
@@ -278,6 +278,7 @@
         %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null || :
     killall -HUP gconfd-2 || :
 fi
+/sbin/ldconfig
 
 %preun
 if [ "$1" -eq 0 -a -n "`which gconftool-2 2>/dev/null`" ]; then
@@ -287,6 +288,8 @@
     killall -HUP gconfd-2 || :
 fi
 
+%postun -p /sbin/ldconfig
+
 %files -f %{name}-%{version}-coreplugins
 %defattr(-, root, root)
 


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

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

From: <rl...@us...> - 2006-10-12 01:08:34

Revision: 17464
          http://svn.sourceforge.net/gaim/?rev=17464&view=rev
Author:   rlaager
Date:     2006-10-11 18:08:28 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
SF Bug #1573887 suggests that we stop special casing ' as an inside-the-word character. I can't come up with a good reason to reject the request, so here it is.

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

Modified: trunk/gtk/plugins/spellchk.c
===================================================================
--- trunk/gtk/plugins/spellchk.c	2006-10-12 01:03:18 UTC (rev 17463)
+++ trunk/gtk/plugins/spellchk.c	2006-10-12 01:08:28 UTC (rev 17464)
@@ -298,7 +298,6 @@
 	g_free(spell);
 }
 
-/* Pango doesn't know about the "'" character.  Let's fix that. */
 static gboolean
 spellchk_inside_word(GtkTextIter *iter)
 {
@@ -329,16 +328,6 @@
 	if (gtk_text_iter_inside_word (iter) == TRUE)
 		return TRUE;
 
-	if (c == '\'') {
-		result = gtk_text_iter_backward_char(iter);
-		output = gtk_text_iter_inside_word(iter);
-
-		if (result)
-			gtk_text_iter_forward_char(iter);
-
-		return output;
-	}
-
 	return 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: [17463] trunk/console/gntdebug.c

From: <sa...@us...> - 2006-10-12 01:03:20

Revision: 17463
          http://svn.sourceforge.net/gaim/?rev=17463&view=rev
Author:   sadrul
Date:     2006-10-11 18:03:18 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Show the glib-errors/warnings in the debug window.

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

Modified: trunk/console/gntdebug.c
===================================================================
--- trunk/console/gntdebug.c	2006-10-12 01:02:07 UTC (rev 17462)
+++ trunk/console/gntdebug.c	2006-10-12 01:03:18 UTC (rev 17463)
@@ -145,6 +145,52 @@
 	gaim_prefs_set_bool("/core/debug/timestamps", debug.timestamps);
 }
 
+/* Xerox */
+static void
+gaim_glib_log_handler(const gchar *domain, GLogLevelFlags flags,
+					  const gchar *msg, gpointer user_data)
+{
+	GaimDebugLevel level;
+	char *new_msg = NULL;
+	char *new_domain = NULL;
+
+	if ((flags & G_LOG_LEVEL_ERROR) == G_LOG_LEVEL_ERROR)
+		level = GAIM_DEBUG_ERROR;
+	else if ((flags & G_LOG_LEVEL_CRITICAL) == G_LOG_LEVEL_CRITICAL)
+		level = GAIM_DEBUG_FATAL;
+	else if ((flags & G_LOG_LEVEL_WARNING) == G_LOG_LEVEL_WARNING)
+		level = GAIM_DEBUG_WARNING;
+	else if ((flags & G_LOG_LEVEL_MESSAGE) == G_LOG_LEVEL_MESSAGE)
+		level = GAIM_DEBUG_INFO;
+	else if ((flags & G_LOG_LEVEL_INFO) == G_LOG_LEVEL_INFO)
+		level = GAIM_DEBUG_INFO;
+	else if ((flags & G_LOG_LEVEL_DEBUG) == G_LOG_LEVEL_DEBUG)
+		level = GAIM_DEBUG_MISC;
+	else
+	{
+		gaim_debug_warning("gntdebug",
+				   "Unknown glib logging level in %d\n", flags);
+
+		level = GAIM_DEBUG_MISC; /* This will never happen. */
+	}
+
+	if (msg != NULL)
+		new_msg = gaim_utf8_try_convert(msg);
+
+	if (domain != NULL)
+		new_domain = gaim_utf8_try_convert(domain);
+
+	if (new_msg != NULL)
+	{
+		gaim_debug(level, (new_domain != NULL ? new_domain : "g_log"),
+				   "%s\n", new_msg);
+
+		g_free(new_msg);
+	}
+
+	g_free(new_domain);
+}
+
 void gg_debug_window_show()
 {
 	debug.paused = false;
@@ -207,6 +253,19 @@
 
 void gg_debug_init()
 {
+/* Xerox */
+#define REGISTER_G_LOG_HANDLER(name) \
+	g_log_set_handler((name), G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL \
+					  | G_LOG_FLAG_RECURSION, \
+					  gaim_glib_log_handler, NULL)
+
+	/* Register the glib log handlers. */
+	REGISTER_G_LOG_HANDLER(NULL);
+	REGISTER_G_LOG_HANDLER("GLib");
+	REGISTER_G_LOG_HANDLER("GModule");
+	REGISTER_G_LOG_HANDLER("GLib-GObject");
+	REGISTER_G_LOG_HANDLER("GThread");
+
 	g_set_print_handler(print_stderr);   /* Redirect the debug messages to stderr */
 	if (gaim_debug_is_enabled())
 		g_timeout_add(0, start_with_debugwin, NULL);


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

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

From: <sa...@us...> - 2006-10-12 01:02:11

Revision: 17462
          http://svn.sourceforge.net/gaim/?rev=17462&view=rev
Author:   sadrul
Date:     2006-10-11 18:02:07 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Patch #1574229 from Richard Nelson (wabz) to fix a crash when adding a buddy
and show-offline is set to true.

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

Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c	2006-10-11 08:59:01 UTC (rev 17461)
+++ trunk/console/gntblist.c	2006-10-12 01:02:07 UTC (rev 17462)
@@ -206,6 +206,8 @@
 		if ((!gaim_prefs_get_bool(PREF_ROOT "/showoffline") && !is_contact_online(contact)) ||
 				contact->currentsize < 1)
 			node_remove(gaim_get_blist(), node);
+		else
+			add_node(node, list->ui_data);
 	} else if (GAIM_BLIST_NODE_IS_GROUP(node)) {
 		GaimGroup *group = (GaimGroup*)node;
 		if ((!gaim_prefs_get_bool(PREF_ROOT "/showoffline") && !is_group_online(group)) ||
@@ -526,6 +528,8 @@
 		return;
 
 	contact = (GaimContact*)node->parent;
+	if (!contact)   /* When a new buddy is added and show-offline is set */
+		return;
 	add_node((GaimBlistNode*)contact, ggblist);
 
 	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), buddy,


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

[Gaim-commits] SF.net SVN: gaim: [17461] web/htdocs/contactinfo.php

From: <the...@us...> - 2006-10-11 08:59:06

Revision: 17461
          http://svn.sourceforge.net/gaim/?rev=17461&view=rev
Author:   thekingant
Date:     2006-10-11 01:59:01 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Sadrul is officially a developer now.  Let me know if I missed any
places.  Also, anyone listed here should feel free to add or remove
their email address, IM screen names, description, etc. as they
see fit.

Modified Paths:
--------------
    web/htdocs/contactinfo.php

Modified: web/htdocs/contactinfo.php
===================================================================
--- web/htdocs/contactinfo.php	2006-10-11 08:58:59 UTC (rev 17460)
+++ web/htdocs/contactinfo.php	2006-10-11 08:59:01 UTC (rev 17461)
@@ -66,6 +66,13 @@
 </dd>
 
 <dt>
+ Sadrul Habib Chowdhury
+</dt>
+<dd>
+<i>Console Gaim (aka GNT Gaim).  And libgnt, of course.</i>
+</dd>
+
+<dt>
  Mark Doliner - &lt;<a href="mailto:the...@us...">the...@us...</a>&gt;
 </dt>
 <dd>
@@ -158,7 +165,6 @@
 
 <dl>
 <dt>Ka-Hing 'javabsp' Cheung</dt>
-<dt>Sadrul Habib Chowdhury</dt>
 <dt>Felipe 'shx' Contreras</dt>
 <dt>Decklin Foster</dt>
 <dt>Casey Harkins</dt>


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

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

From: <the...@us...> - 2006-10-11 08:59:03

Revision: 17460
          http://svn.sourceforge.net/gaim/?rev=17460&view=rev
Author:   thekingant
Date:     2006-10-11 01:58:59 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
Sadrul is officially a developer now.  Let me know if I missed any
places.  Also, anyone listed here should feel free to add or remove
their email address, IM screen names, description, etc. as they
see fit.

Modified Paths:
--------------
    trunk/AUTHORS
    trunk/gtk/gtkdialogs.c

Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2006-10-11 04:27:17 UTC (rev 17459)
+++ trunk/AUTHORS	2006-10-11 08:58:59 UTC (rev 17460)
@@ -20,6 +20,7 @@
 Daniel 'datallah' Atallah
 Ethan 'Paco-Paco' Blanton - Developer
 Thomas Butter - Developer
+Sadrul Habib Chowdhury - Developer
 Mark 'KingAnt' Doliner - Developer
 Christian 'ChipX86' Hammond - Developer & Webmaster
 Gary 'grim' Kramlich - Developer
@@ -36,7 +37,6 @@
 Crazy Patch Writers:
 -------------------
 Ka-Hing 'javabsp' Cheung
-Sadrul Habib Chowdhury
 Felipe 'shx' Contreras
 Decklin Foster
 Peter 'Bleeter' Lawler

Modified: trunk/gtk/gtkdialogs.c
===================================================================
--- trunk/gtk/gtkdialogs.c	2006-10-11 04:27:17 UTC (rev 17459)
+++ trunk/gtk/gtkdialogs.c	2006-10-11 08:58:59 UTC (rev 17460)
@@ -64,9 +64,10 @@
 /* Order: Lead Developer, then Alphabetical by Last Name */
 static struct developer developers[] = {
 	{"Sean Egan",					N_("lead developer"), "sea...@gm..."},
-	{"Daniel 'datallah' Atallah",	N_("developer"),	NULL},
+	{"Daniel 'datallah' Atallah",	N_("developer"), NULL},
 	{"Ethan 'Paco-Paco' Blanton",	N_("developer"), NULL},
-	{"Thomas Butter",		N_("developer"), NULL},
+	{"Thomas Butter",				N_("developer"), NULL},
+	{"Sadrul Habib Chowdhury",		N_("developer"), NULL},
 	{"Mark 'KingAnt' Doliner",		N_("developer"), NULL},
 	{"Christian 'ChipX86' Hammond",	N_("developer & webmaster"), NULL},
 	{"Gary 'grim' Kramlich",		N_("developer"), NULL},
@@ -85,7 +86,6 @@
 /* Order: Alphabetical by Last Name */
 static struct developer patch_writers[] = {
 	{"Ka-Hing 'javabsp' Cheung",	NULL,	NULL},
-	{"Sadrul Habib Chowdhury",      NULL,   NULL},
 	{"Felipe 'shx' Contreras",		NULL,	NULL},
 	{"Decklin Foster",				NULL,	NULL},
 	{"Casey Harkins",               NULL,   NULL},


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

[Gaim-commits] SF.net SVN: gaim: [17459] trunk/gtk

From: <dat...@us...> - 2006-10-11 04:27:22

Revision: 17459
          http://svn.sourceforge.net/gaim/?rev=17459&view=rev
Author:   datallah
Date:     2006-10-10 21:27:17 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
These apparently crept in accidentally.

Removed Paths:
-------------
    trunk/gtk/docklet-x11.c
    trunk/gtk/docklet.h

Deleted: trunk/gtk/docklet-x11.c
===================================================================
--- trunk/gtk/docklet-x11.c	2006-10-11 03:13:33 UTC (rev 17458)
+++ trunk/gtk/docklet-x11.c	2006-10-11 04:27:17 UTC (rev 17459)
@@ -1,305 +0,0 @@
-/*
- * System tray icon (aka docklet) plugin for Gaim
- *
- * Copyright (C) 2002-3 Robert McQueen <rob...@de...>
- * Copyright (C) 2003 Herman Bloggs <her...@ya...>
- * Inspired by a similar plugin by:
- *  John (J5) Palmieri <jo...@ma...>
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "internal.h"
-#include "gtkgaim.h"
-#include "debug.h"
-#include "gaimstock.h"
-
-#include "gaim.h"
-#include "gtkdialogs.h"
-
-#include "eggtrayicon.h"
-#include "docklet.h"
-
-#define EMBED_TIMEOUT 5000
-
-/* globals */
-static EggTrayIcon *docklet = NULL;
-static GtkWidget *image = NULL;
-static GtkTooltips *tooltips = NULL;
-static GdkPixbuf *blank_icon = NULL;
-static int embed_timeout = 0;
-
-/* protos */
-static void docklet_x11_create(void);
-
-static gboolean
-docklet_x11_create_cb()
-{
-	docklet_x11_create();
-
-	return FALSE; /* for when we're called by the glib idle handler */
-}
-
-static void
-docklet_x11_embedded_cb(GtkWidget *widget, void *data)
-{
-	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "embedded\n");
-	
-	g_source_remove(embed_timeout);
-	embed_timeout = 0;
-	docklet_embedded();
-}
-
-static void
-docklet_x11_destroyed_cb(GtkWidget *widget, void *data)
-{
-	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "destroyed\n");
-
-	docklet_remove();
-
-	g_object_unref(G_OBJECT(docklet));
-	docklet = NULL;
-
-	g_idle_add(docklet_x11_create_cb, &handle);
-}
-
-static void
-docklet_x11_clicked_cb(GtkWidget *button, GdkEventButton *event, void *data)
-{
-	if (event->type != GDK_BUTTON_PRESS)
-		return;
-
-	docklet_clicked(event->button);
-}
-
-static void
-docklet_x11_update_icon(DockletStatus icon)
-{
-	const gchar *icon_name = NULL;
-
-	g_return_if_fail(image != NULL);
-
-	switch (icon) {
-		case DOCKLET_STATUS_OFFLINE:
-			icon_name = GAIM_STOCK_ICON_OFFLINE;
-			break;
-		case DOCKLET_STATUS_CONNECTING:
-			icon_name = GAIM_STOCK_ICON_CONNECT;
-			break;
-		case DOCKLET_STATUS_ONLINE:
-			icon_name = GAIM_STOCK_ICON_ONLINE;
-			break;
-		case DOCKLET_STATUS_ONLINE_PENDING:
-			icon_name = GAIM_STOCK_ICON_ONLINE_MSG;
-			break;
-		case DOCKLET_STATUS_AWAY:
-			icon_name = GAIM_STOCK_ICON_AWAY;
-			break;
-		case DOCKLET_STATUS_AWAY_PENDING:
-			icon_name = GAIM_STOCK_ICON_AWAY_MSG;
-			break;
-	}
-
-	if(icon_name)
-		gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-
-#if 0
-	GdkPixbuf *p;
-	GdkBitmap *mask = NULL;
-
-	p = gtk_widget_render_icon(GTK_WIDGET(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
-
-	if (p && (gdk_pixbuf_get_colorspace(p) == GDK_COLORSPACE_RGB) && (gdk_pixbuf_get_bits_per_sample(p) == 8)
-	   && (gdk_pixbuf_get_has_alpha(p)) && (gdk_pixbuf_get_n_channels(p) == 4)) {
-		int len = gdk_pixbuf_get_width(p) * gdk_pixbuf_get_height(p);
-		guchar *data = gdk_pixbuf_get_pixels(p);
-		guchar *bitmap = g_malloc((len / 8) + 1);
-		int i;
-
-		for (i = 0; i < len; i++)
-			if (data[i*4 + 3] > 55)
-				bitmap[i/8] |= 1 << i % 8;
-			else
-				bitmap[i/8] &= ~(1 << i % 8);
-
-		mask = gdk_bitmap_create_from_data(GDK_DRAWABLE(GTK_WIDGET(image)->window), bitmap, gdk_pixbuf_get_width(p), gdk_pixbuf_get_height(p));
-		g_free(bitmap);
-	}
-
-	if (mask)
-		gdk_window_shape_combine_mask(image->window, mask, 0, 0);
-
-	g_object_unref(G_OBJECT(p));
-#endif
-}
-
-static void
-docklet_x11_blank_icon()
-{
-	if (!blank_icon) {
-		gint width, height;
-
-		gtk_icon_size_lookup(GTK_ICON_SIZE_LARGE_TOOLBAR, &width, &height);
-		blank_icon = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-		gdk_pixbuf_fill(blank_icon, 0);
-	}
-
-	gtk_image_set_from_pixbuf(GTK_IMAGE(image), blank_icon);
-}
-
-static void
-docklet_x11_set_tooltip(gchar *tooltip)
-{
-	if (!tooltips)
-		tooltips = gtk_tooltips_new();
-
-	/* image->parent is a GtkEventBox */
-	if (tooltip) {
-		gtk_tooltips_enable(tooltips);
-		gtk_tooltips_set_tip(tooltips, image->parent, tooltip, NULL);
-	} else {
-		gtk_tooltips_set_tip(tooltips, image->parent, "", NULL);
-		gtk_tooltips_disable(tooltips);
-	}
-}
-
-#if GTK_CHECK_VERSION(2,2,0)
-static void
-docklet_x11_position_menu(GtkMenu *menu, int *x, int *y, gboolean *push_in,
-						  gpointer user_data)
-{
-	GtkWidget *widget = GTK_WIDGET(docklet);
-	GtkRequisition req;
-	gint menu_xpos, menu_ypos;
-
-	gtk_widget_size_request(GTK_WIDGET(menu), &req);
-	gdk_window_get_origin(widget->window, &menu_xpos, &menu_ypos);
-
-	menu_xpos += widget->allocation.x;
-	menu_ypos += widget->allocation.y;
-
-	if (menu_ypos > gdk_screen_get_height(gtk_widget_get_screen(widget)) / 2)
-		menu_ypos -= req.height;
-	else
-		menu_ypos += widget->allocation.height;
-
-	*x = menu_xpos;
-	*y = menu_ypos;
-
-	*push_in = TRUE;
-}
-#endif
-
-static void
-docklet_x11_destroy()
-{
-	g_return_if_fail(docklet != NULL);
-
-	docklet_remove();
-
-	g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(docklet_x11_destroyed_cb), NULL);
-	gtk_widget_destroy(GTK_WIDGET(docklet));
-
-	g_object_unref(G_OBJECT(docklet));
-	docklet = NULL;
-
-	if (blank_icon)
-		g_object_unref(G_OBJECT(blank_icon));
-	blank_icon = NULL;
-
-	image = NULL;
-
-	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "destroyed\n");
-}
-
-static gboolean
-docklet_x11_embed_timeout_cb()
-{
-	/* The docklet was not embedded within the timeout.
-	 * Remove it as a visibility manager, but leave the plugin
-	 * loaded so that it can embed automatically if/when a notification
-	 * area becomes available.
-	 */
-	gaim_debug_info("tray icon", "failed to embed within timeout\n");
-	docklet_remove();
-
-	return FALSE;
-}
-
-static void
-docklet_x11_create()
-{
-	GtkWidget *box;
-
-	if (docklet) {
-		/* if this is being called when a tray icon exists, it's because
-		   something messed up. try destroying it before we proceed,
-		   although docklet_refcount may be all hosed. hopefully won't happen. */
-		gaim_debug(GAIM_DEBUG_WARNING, "tray icon", "trying to create icon but it already exists?\n");
-		docklet_x11_destroy();
-	}
-
-	docklet = egg_tray_icon_new("Gaim");
-	box = gtk_event_box_new();
-	image = gtk_image_new();
-
-	g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(docklet_x11_embedded_cb), NULL);
-	g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(docklet_x11_destroyed_cb), NULL);
-	g_signal_connect(G_OBJECT(box), "button-press-event", G_CALLBACK(docklet_x11_clicked_cb), NULL);
-
-	gtk_container_add(GTK_CONTAINER(box), image);
-	gtk_container_add(GTK_CONTAINER(docklet), box);
-
-	if (!gtk_check_version(2,4,0))
-		g_object_set(G_OBJECT(box), "visible-window", FALSE, NULL);
-
-	gtk_widget_show_all(GTK_WIDGET(docklet));
-
-	/* ref the docklet before we bandy it about the place */
-	g_object_ref(G_OBJECT(docklet));
-
-	/* This is a hack to avoid a race condition between the docklet getting
-	 * embedded in the notification area and the gtkblist restoring its
-	 * previous visibility state.  If the docklet does not get embedded within
-	 * the timeout, it will be removed as a visibility manager until it does
-	 * get embedded.  Ideally, we would only call docklet_embedded() when the
-	 * icon was actually embedded.
-	 */
-	docklet_embedded();
-	embed_timeout = g_timeout_add(EMBED_TIMEOUT, docklet_x11_embed_timeout_cb, NULL);
-
-	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "created\n");
-}
-
-static struct docklet_ui_ops ui_ops =
-{
-	docklet_x11_create,
-	docklet_x11_destroy,
-	docklet_x11_update_icon,
-	docklet_x11_blank_icon,
-	docklet_x11_set_tooltip,
-#if GTK_CHECK_VERSION(2,2,0)
-	docklet_x11_position_menu
-#else
-	NULL
-#endif
-};
-
-void
-docklet_ui_init()
-{
-	docklet_set_ui_ops(&ui_ops);
-}

Deleted: trunk/gtk/docklet.h
===================================================================
--- trunk/gtk/docklet.h	2006-10-11 03:13:33 UTC (rev 17458)
+++ trunk/gtk/docklet.h	2006-10-11 04:27:17 UTC (rev 17459)
@@ -1,61 +0,0 @@
-/* 
- * System tray icon (aka docklet) plugin for Gaim
- * 
- * Copyright (C) 2002-3 Robert McQueen <rob...@de...>
- * Copyright (C) 2003 Herman Bloggs <her...@ya...>
- * Inspired by a similar plugin by:
- *  John (J5) Palmieri <jo...@ma...>
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef _DOCKLET_H_
-#define _DOCKLET_H_
-
-typedef enum
-{
-	DOCKLET_STATUS_OFFLINE,
-	DOCKLET_STATUS_ONLINE,
-	DOCKLET_STATUS_ONLINE_PENDING,
-	DOCKLET_STATUS_AWAY,
-	DOCKLET_STATUS_AWAY_PENDING,
-	DOCKLET_STATUS_CONNECTING
-} DockletStatus;
-
-struct docklet_ui_ops
-{
-	void (*create)(void);
-	void (*destroy)(void);
-	void (*update_icon)(DockletStatus);
-	void (*blank_icon)(void);
-	void (*set_tooltip)(gchar *);
-	GtkMenuPositionFunc position_menu;
-};
-
-/* useful for setting idle callbacks that will be cleaned up */
-extern GaimPlugin *handle;
-
-/* functions in docklet.c */
-void docklet_clicked(int);
-void docklet_embedded(void);
-void docklet_remove(void);
-void docklet_set_ui_ops(struct docklet_ui_ops *);
-void docklet_unload(void);
-
-/* function in docklet-{x11,win32}.c */
-void docklet_ui_init(void);
-
-#endif /* _DOCKLET_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: [17458] trunk

From: <fac...@us...> - 2006-10-11 03:14:20

Revision: 17458
          http://svn.sourceforge.net/gaim/?rev=17458&view=rev
Author:   faceprint
Date:     2006-10-10 20:13:33 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
I think we should let people know why we're not connecting...

If someone can think of better (shorter) wording, feel free to change it

Modified Paths:
--------------
    trunk/gtk/gtkconn.c
    trunk/gtk/gtkstatusbox.c
    trunk/gtk/gtkstatusbox.h
    trunk/libgaim/account.c

Modified: trunk/gtk/gtkconn.c
===================================================================
--- trunk/gtk/gtkconn.c	2006-10-11 01:13:59 UTC (rev 17457)
+++ trunk/gtk/gtkconn.c	2006-10-11 03:13:33 UTC (rev 17458)
@@ -194,9 +194,14 @@
 	}
 }
 
-static void gaim_gtk_connection_network_connected () 
+static void gaim_gtk_connection_network_connected ()
 {
 	GList *list = gaim_accounts_get_all_active();
+	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+
+	if(gtkblist)
+		gtk_gaim_status_box_set_network_available(GTK_GAIM_STATUS_BOX(gtkblist->statusbox), TRUE);
+
 	while (list) {
 		GaimAccount *account = (GaimAccount*)list->data;
 		GaimAutoRecon *info = g_hash_table_lookup(hash, account);
@@ -204,12 +209,17 @@
 			free_auto_recon(info);
 		do_signon(account);
 		list = list->next;
- 	}
+	}
 }
 
-static void gaim_gtk_connection_network_disconnected () 
+static void gaim_gtk_connection_network_disconnected ()
 {
 	GList *l = gaim_accounts_get_all_active();
+	GaimGtkBuddyList *gtkblist = gaim_gtk_blist_get_default_gtk_blist();
+
+	if(gtkblist)
+		gtk_gaim_status_box_set_network_available(GTK_GAIM_STATUS_BOX(gtkblist->statusbox), FALSE);
+
 	while (l) {
 		GaimAccount *a = (GaimAccount*)l->data;
 		gaim_account_disconnect(a);

Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c	2006-10-11 01:13:59 UTC (rev 17457)
+++ trunk/gtk/gtkstatusbox.c	2006-10-11 03:13:33 UTC (rev 17458)
@@ -43,6 +43,7 @@
 
 #include "account.h"
 #include "internal.h"
+#include "network.h"
 #include "savedstatuses.h"
 #include "status.h"
 #include "debug.h"
@@ -553,6 +554,8 @@
 		secondary = g_strdup(_("Typing"));
 	else if (status_box->connecting)
 		secondary = g_strdup(_("Connecting"));
+	else if (!status_box->network_available)
+		secondary = g_strdup(_("Waiting for network connection"));
 	else if (gaim_savedstatus_is_transient(saved_status))
 		secondary = NULL;
 	else
@@ -1265,6 +1268,7 @@
 	GtkTextBuffer *buffer;
 
 	status_box->imhtml_visible = FALSE;
+	status_box->network_available = gaim_network_is_available();
 	status_box->connecting = FALSE;
 	status_box->typing = 0;
 	status_box->toggle_button = gtk_toggle_button_new();
@@ -1609,6 +1613,15 @@
 }
 
 void
+gtk_gaim_status_box_set_network_available(GtkGaimStatusBox *status_box, gboolean available)
+{
+	if (!status_box)
+		return;
+	status_box->network_available = available;
+	gtk_gaim_status_box_refresh(status_box);
+}
+
+void
 gtk_gaim_status_box_set_connecting(GtkGaimStatusBox *status_box, gboolean connecting)
 {
 	if (!status_box)

Modified: trunk/gtk/gtkstatusbox.h
===================================================================
--- trunk/gtk/gtkstatusbox.h	2006-10-11 01:13:59 UTC (rev 17457)
+++ trunk/gtk/gtkstatusbox.h	2006-10-11 03:13:33 UTC (rev 17458)
@@ -110,6 +110,7 @@
 	int typing_index;
 	GdkPixbuf *typing_pixbufs[4];
 
+	gboolean network_available;
 	gboolean connecting;
 	guint typing;
 
@@ -156,6 +157,9 @@
 gtk_gaim_status_box_add_separator(GtkGaimStatusBox *status_box);
 
 void
+gtk_gaim_status_box_set_network_available(GtkGaimStatusBox *status_box, gboolean available);
+
+void
 gtk_gaim_status_box_set_connecting(GtkGaimStatusBox *status_box, gboolean connecting);
 
 void

Modified: trunk/libgaim/account.c
===================================================================
--- trunk/libgaim/account.c	2006-10-11 01:13:59 UTC (rev 17457)
+++ trunk/libgaim/account.c	2006-10-11 03:13:33 UTC (rev 17458)
@@ -2246,7 +2246,7 @@
 	/* If we're not connected to the Internet right now, we bail on this */
 	if (!gaim_network_is_available())
 	{
-		fprintf(stderr, "Network not connected; skipping reconnect\n");
+		gaim_debug_info("account", "Network not connected; skipping reconnect\n");
 		return;
 	}
 


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

[Gaim-commits] SF.net SVN: gaim: [17457] web/htdocs/sean

From: <sea...@us...> - 2006-10-11 01:14:05

Revision: 17457
          http://svn.sourceforge.net/gaim/?rev=17457&view=rev
Author:   seanegan
Date:     2006-10-10 18:13:59 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
blog about networkmanager and docket

Added Paths:
-----------
    web/htdocs/sean/images/notificationarea.png
    web/htdocs/sean/posts/tray-icon.txt

Added: web/htdocs/sean/images/notificationarea.png
===================================================================
(Binary files differ)


Property changes on: web/htdocs/sean/images/notificationarea.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: web/htdocs/sean/posts/tray-icon.txt
===================================================================
--- web/htdocs/sean/posts/tray-icon.txt	                        (rev 0)
+++ web/htdocs/sean/posts/tray-icon.txt	2006-10-11 01:13:59 UTC (rev 17457)
@@ -0,0 +1,48 @@
+"System Tray" and NetworkManager
+
+<p>Barring some emergency, we should have beta4 out sometime this week. Here
+are a few more of its features introduced last week</p>
+
+<h3>Notification Area Icon</h3>
+
+<p>Another very common question I hope to put to rest with beta4: when I close
+the buddy list window, Gaim should not exit but go to the 'notification area'
+or 'system tray.'</p>
+
+<p>Gaim users have been able to do this since 1999 by installing a special
+"applet" version of Gaim, and since 2003, the feature has been available for
+all Gaim users by loading the 'System Tray Icon' included with Gaim. Last week
+I removed the plugin and made the feature on for everyone.</p>
+
+<p>There's some controversy behind this change. The guidelines behind the 
+"system trays" on both Windows and UNIX-like operating systems say the 
+function should be used only for temporary, transient notifications. On 
+Windows, applications have avoided it, using the area as a place to provide
+access to applications without any windows, which many complain has
+cluttered this area to the point of uselessness.</p>
+
+<p>Despite this, many distributors of Gaim have taken to enable the feature
+by default, and it remains one of the most commonly requested features by
+people who have never checked the plugins. Because of this, we've turned 
+the "system tray icon" on for everyone.</p>
+
+<h3>NetworkManager</h3>
+
+<p>Another application that lives in the "system tray," even when it doesn't
+have any urgent notifications, is NetworkManager. NetworkManager is a really 
+cool system that makes connecting to various networks on Linux really, really 
+easy. It also provides a way for an application to be informed when the 
+network status changes: when a cable is unplugged, when you connect to a 
+wireless networ, etc.</p>
+
+<p>Thanks to work by Paul Betts, Gaim can now talk to NetworkManager when
+connecting to IM services. Before it logs in, it will make sure you're 
+connected to the network and, if not, connect you as soon as the network
+comes available. When the network goes away, Gaim will disconnect; when it comes back, it will reconnect.</p>
+
+<p>Thanks, Paul!</p>
+
+<center>
+<img src='http://gaim.sf.net/sean/images/notificationarea.png'/>
+</center>
+


Property changes on: web/htdocs/sean/posts/tray-icon.txt
___________________________________________________________________
Name: svn:mime-type
   + text/plain
Name: svn:eol-style
   + native


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

[Gaim-commits] SF.net SVN: gaim: [17456] trunk/gtk/plugins/win32/winprefs/winprefs.c

From: <dat...@us...> - 2006-10-10 17:58:45

Revision: 17456
          http://svn.sourceforge.net/gaim/?rev=17456&view=rev
Author:   datallah
Date:     2006-10-10 10:58:40 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
This is backwards.

Modified Paths:
--------------
    trunk/gtk/plugins/win32/winprefs/winprefs.c

Modified: trunk/gtk/plugins/win32/winprefs/winprefs.c
===================================================================
--- trunk/gtk/plugins/win32/winprefs/winprefs.c	2006-10-10 08:19:45 UTC (rev 17455)
+++ trunk/gtk/plugins/win32/winprefs/winprefs.c	2006-10-10 17:58:40 UTC (rev 17456)
@@ -237,7 +237,7 @@
 gtkwgaim_conv_chat_blink(GaimAccount *account, const char *who, char **message,
 		GaimConversation *conv, GaimMessageFlags flags, void *data)
 {
-	if(!gaim_prefs_get_bool(PREF_CHAT_BLINK))
+	if(gaim_prefs_get_bool(PREF_CHAT_BLINK))
 		gtkwgaim_conv_blink(conv, flags);
 
 	return 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: [17455] trunk/gtk/gtkaccount.c

From: <the...@us...> - 2006-10-10 08:19:47

Revision: 17455
          http://svn.sourceforge.net/gaim/?rev=17455&view=rev
Author:   thekingant
Date:     2006-10-10 01:19:45 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
Don't try to do stuff if the user cancels out of the buddy icon selection
dialog in the account editor.  This gets rid of an assertion failure.

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-10-10 08:14:57 UTC (rev 17454)
+++ trunk/gtk/gtkaccount.c	2006-10-10 08:19:45 UTC (rev 17455)
@@ -296,7 +296,8 @@
 
 	dialog = data;
 
-	set_dialog_icon(dialog, gaim_gtk_convert_buddy_icon(dialog->plugin, filename));
+	if (filename != NULL)
+		set_dialog_icon(dialog, gaim_gtk_convert_buddy_icon(dialog->plugin, filename));
 
 	dialog->icon_filesel = NULL;
 }


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

[Gaim-commits] SF.net SVN: gaim: [17454] trunk/gtk/gtkaccount.c

From: <the...@us...> - 2006-10-10 08:15:01

Revision: 17454
          http://svn.sourceforge.net/gaim/?rev=17454&view=rev
Author:   thekingant
Date:     2006-10-10 01:14:57 -0700 (Tue, 10 Oct 2006)

Log Message:
-----------
Make the buddy icon button in modify account windows clickable and
get rid of the modify button

Modified Paths:
--------------
    trunk/gtk/gtkaccount.c

Modified: trunk/gtk/gtkaccount.c
===================================================================
--- trunk/gtk/gtkaccount.c	2006-10-10 00:45:14 UTC (rev 17453)
+++ trunk/gtk/gtkaccount.c	2006-10-10 08:14:57 UTC (rev 17454)
@@ -573,10 +573,16 @@
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
+	button = gtk_button_new();
+	gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
+	g_signal_connect(G_OBJECT(button), "clicked",
+	                 G_CALLBACK(icon_select_cb), dialog);
+
 	dialog->icon_entry = gtk_image_new();
-	gtk_box_pack_start(GTK_BOX(hbox), dialog->icon_entry,
-					   FALSE, FALSE, 0);
+	gtk_container_add(GTK_CONTAINER(button), dialog->icon_entry);
 	gtk_widget_show(dialog->icon_entry);
+	/* TODO: Uh, isn't this next line pretty useless? */
 	gaim_set_accessible_label (dialog->icon_entry, label);
 	dialog->icon_path = NULL;
 
@@ -588,12 +594,6 @@
 	gtk_box_pack_start(GTK_BOX(vbox2), hbox2, FALSE, FALSE, GAIM_HIG_BORDER);
 	gtk_widget_show(hbox2);
 
-	button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
-	gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
-	g_signal_connect(G_OBJECT(button), "clicked",
-					 G_CALLBACK(icon_select_cb), dialog);
-	gtk_widget_show(button);
-
 	button = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
 	g_signal_connect(G_OBJECT(button), "clicked",
 			 G_CALLBACK(icon_reset_cb), dialog);


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

[Gaim-commits] SF.net SVN: gaim: [17453] trunk/gtk/gtkconv.c

From: <dat...@us...> - 2006-10-10 00:45:20

Revision: 17453
          http://svn.sourceforge.net/gaim/?rev=17453&view=rev
Author:   datallah
Date:     2006-10-09 17:45:14 -0700 (Mon, 09 Oct 2006)

Log Message:
-----------
Fix chat userlist width saving (use the VBox alloc. width for both saving and loading).

Modified Paths:
--------------
    trunk/gtk/gtkconv.c

Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c	2006-10-09 03:02:32 UTC (rev 17452)
+++ trunk/gtk/gtkconv.c	2006-10-10 00:45:14 UTC (rev 17453)
@@ -202,6 +202,14 @@
 }
 
 static gboolean
+lbox_size_allocate_cb(GtkWidget *w, GtkAllocation *allocation, gpointer data)
+{
+	gaim_prefs_set_int("/gaim/gtk/conversations/chat/userlist_width", allocation->width == 1 ? 0 : allocation->width);
+
+	return FALSE;
+}
+
+static gboolean
 size_allocate_cb(GtkWidget *w, GtkAllocation *allocation, GaimGtkConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
@@ -239,8 +247,6 @@
 		}
 		if (w == gtkconv->lower_hbox)
 			gaim_prefs_set_int("/gaim/gtk/conversations/chat/entry_height", allocation->height);
-		if (w == gtkconv->u.chat->list)
-			gaim_prefs_set_int("/gaim/gtk/conversations/chat/userlist_width", allocation->width == 1 ? 0 : allocation->width);
 	}
 
 	return FALSE;
@@ -4005,7 +4011,7 @@
 					 G_CALLBACK(right_click_chat_cb), gtkconv);
 	g_signal_connect(G_OBJECT(list), "popup-menu",
 			 G_CALLBACK(gtkconv_chat_popup_menu_cb), gtkconv);
-        g_signal_connect(G_OBJECT(list), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv);
+	g_signal_connect(G_OBJECT(lbox), "size-allocate", G_CALLBACK(lbox_size_allocate_cb), gtkconv);
 
 
 	rend = gtk_cell_renderer_text_new();


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

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

From: <dat...@us...> - 2006-10-09 03:02:44

Revision: 17452
          http://svn.sourceforge.net/gaim/?rev=17452&view=rev
Author:   datallah
Date:     2006-10-08 20:02:32 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
Depluginize the wingaim conv. flashing.
IM window flashing is now always on, chat window flashing is a pref in the wingaim options plugin.
Fix some callbacks where 'int' was used instead of 'GaimMessageFlags'

Modified Paths:
--------------
    trunk/gtk/gtkconv.c
    trunk/gtk/gtkmain.c
    trunk/gtk/gtksound.c
    trunk/gtk/plugins/win32/winprefs/winprefs.c
    trunk/gtk/win32/gtkwin32dep.c
    trunk/gtk/win32/gtkwin32dep.h
    trunk/libgaim/plugins/signals-test.c

Modified: trunk/gtk/gtkconv.c
===================================================================
--- trunk/gtk/gtkconv.c	2006-10-08 19:17:32 UTC (rev 17451)
+++ trunk/gtk/gtkconv.c	2006-10-09 03:02:32 UTC (rev 17452)
@@ -215,7 +215,7 @@
 	if (gtkconv->auto_resize) {
 		return FALSE;
 	}
-	
+
 	/* I find that I resize the window when it has a bunch of conversations in it, mostly so that the
 	 * tab bar will fit, but then I don't want new windows taking up the entire screen.  I check to see
 	 * if there is only one conversation in the window.  This way we'll be setting new windows to the
@@ -2263,7 +2263,7 @@
 	}
 }
 
-/* This gets added as an idle handler when doing something that 
+/* This gets added as an idle handler when doing something that
  * redraws the icon. It sets the auto_resize gboolean to TRUE.
  * This way, when the size_allocate callback gets triggered, it notices
  * that this is an autoresize, and after the main loop iterates, it
@@ -2296,7 +2296,7 @@
 
 	gtkconv->auto_resize = TRUE;
 	g_idle_add(reset_auto_resize_cb, gtkconv);
-	
+
 	gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL);
 	buf = gdk_pixbuf_animation_iter_get_pixbuf(gtkconv->u.im->iter);
 
@@ -3329,7 +3329,7 @@
 	gboolean is_buddy;
 	gchar *alias_key, *name, *alias;
 	int flags;
-	
+
 	alias = cb->alias;
 	name  = cb->name;
 	flags = GPOINTER_TO_INT(cb->flags);
@@ -3357,10 +3357,10 @@
 	{
 		GdkColor send_color;
 		gdk_color_parse(SEND_COLOR, &send_color);
-		
-#if GTK_CHECK_VERSION(2,6,0) 
+
+#if GTK_CHECK_VERSION(2,6,0)
 		gtk_list_store_insert_with_values(ls, &iter,
-/* 
+/*
  * The GTK docs are mute about the effects of the "row" value for performance.
  * X-Chat hardcodes their value to 0 (prepend) and -1 (append), so we will too.
  * It *might* be faster to search the gtk_list_store and set row accurately,
@@ -3985,7 +3985,7 @@
 	gtk_widget_show(sw);
 
 	ls = gtk_list_store_new(CHAT_USERS_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING,
-							G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, 
+							G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT,
 							GDK_TYPE_COLOR, G_TYPE_INT);
 	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(ls), CHAT_USERS_ALIAS_KEY_COLUMN,
 									sort_chat_users, NULL, NULL);
@@ -3998,7 +3998,7 @@
 												   "pixbuf", CHAT_USERS_ICON_COLUMN, NULL);
 	gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
-	gtk_widget_set_size_request(lbox, 
+	gtk_widget_set_size_request(lbox,
 	                            gaim_prefs_get_int("/gaim/gtk/conversations/chat/userlist_width"), -1);
 
 	g_signal_connect(G_OBJECT(list), "button_press_event",
@@ -4006,8 +4006,8 @@
 	g_signal_connect(G_OBJECT(list), "popup-menu",
 			 G_CALLBACK(gtkconv_chat_popup_menu_cb), gtkconv);
         g_signal_connect(G_OBJECT(list), "size-allocate", G_CALLBACK(size_allocate_cb), gtkconv);
-	      
-	
+
+
 	rend = gtk_cell_renderer_text_new();
 
 	g_object_set(rend,
@@ -4478,7 +4478,7 @@
 
 static void
 received_im_msg_cb(GaimAccount *account, char *sender, char *message,
-				   GaimConversation *conv, int flags)
+				   GaimConversation *conv, GaimMessageFlags flags)
 {
 	GaimConversationUiOps *ui_ops = gaim_gtk_conversations_get_conv_ui_ops();
 	if (conv != NULL)
@@ -5029,7 +5029,7 @@
 
 #if GTK_CHECK_VERSION(2,6,0)
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls),  GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID,
-										 GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID); 
+										 GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID);
 #endif
 
 	l = cbuddies;
@@ -5038,7 +5038,7 @@
 		l = l->next;
 	}
 
-	/* Currently GTK+ maintains our sorted list after it's in the tree. 
+	/* Currently GTK+ maintains our sorted list after it's in the tree.
 	 * This may change if it turns out we can manage it faster ourselves.
  	 */
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(ls),  CHAT_USERS_ALIAS_KEY_COLUMN,
@@ -5321,10 +5321,10 @@
 	g_signal_connect(smiley->loader, "closed", G_CALLBACK(gaim_gtkconv_custom_smiley_closed), smiley);
 
 	gtk_imhtml_associate_smiley(imhtml, sml, smiley);
- 
+
 	return TRUE;
 }
- 
+
 static gboolean
 gaim_gtkconv_custom_smiley_add(GaimConversation *conv, const char *smile, gboolean remote)
 {
@@ -5335,26 +5335,26 @@
 	if (!conv || !smile || !*smile) {
 		return FALSE;
 	}
- 
+
 	/* If smileys are off, return false */
 	if (gaim_gtkthemes_smileys_disabled())
 		return FALSE;
- 
+
 	/* If possible add this smiley to the current theme.
 	 * The addition is only temporary: custom smilies aren't saved to disk. */
 	conv_sml = gaim_account_get_protocol_name(conv->account);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
- 
+
 	for (list = (struct smiley_list *)current_smiley_theme->list; list; list = list->next) {
 		if (!strcmp(list->sml, conv_sml)) {
 			sml = list->sml;
 			break;
 		}
 	}
- 
+
 	if (!add_custom_smiley_for_imhtml(GTK_IMHTML(gtkconv->imhtml), sml, smile))
 		return FALSE;
- 
+
 	if (!remote)	/* If it's a local custom smiley, then add it for the entry */
 		if (!add_custom_smiley_for_imhtml(GTK_IMHTML(gtkconv->entry), sml, smile))
 			return FALSE;
@@ -6229,7 +6229,7 @@
 }
 
 static void
-account_status_changed_cb(GaimAccount *account, GaimStatus *oldstatus, 
+account_status_changed_cb(GaimAccount *account, GaimStatus *oldstatus,
                           GaimStatus *newstatus)
 {
 	GList *l;
@@ -6404,7 +6404,7 @@
 	if (conv)
 		gaim_gtkconv_update_fields(conv, GAIM_GTKCONV_TAB_ICON);
 }
-	
+
 static void
 update_buddy_icon(GaimBuddy *buddy)
 {
@@ -6660,7 +6660,7 @@
 	gaim_signal_connect(gaim_connections_get_handle(), "signed-off", handle,
 						G_CALLBACK(account_signed_off_cb),
 						GINT_TO_POINTER(GAIM_CONV_ACCOUNT_OFFLINE));
-	
+
 	gaim_signal_connect(gaim_conversations_get_handle(), "received-im-msg",
 						handle, G_CALLBACK(received_im_msg_cb), NULL);
 

Modified: trunk/gtk/gtkmain.c
===================================================================
--- trunk/gtk/gtkmain.c	2006-10-08 19:17:32 UTC (rev 17451)
+++ trunk/gtk/gtkmain.c	2006-10-09 03:02:32 UTC (rev 17452)
@@ -793,6 +793,11 @@
 #ifdef HAVE_STARTUP_NOTIFICATION
 	startup_notification_complete();
 #endif
+
+#ifdef _WIN32
+	gtkwgaim_post_init();
+#endif
+
 	gtk_main();
 
 #ifdef HAVE_SIGNAL_H

Modified: trunk/gtk/gtksound.c
===================================================================
--- trunk/gtk/gtksound.c	2006-10-08 19:17:32 UTC (rev 17451)
+++ trunk/gtk/gtksound.c	2006-10-09 03:02:32 UTC (rev 17452)
@@ -144,7 +144,7 @@
 static void
 im_msg_received_cb(GaimAccount *account, char *sender,
 				   char *message, GaimConversation *conv,
-				   int flags, GaimSoundEventID event)
+				   GaimMessageFlags flags, GaimSoundEventID event)
 {
 	if (flags & GAIM_MESSAGE_DELAYED)
 		return;

Modified: trunk/gtk/plugins/win32/winprefs/winprefs.c
===================================================================
--- trunk/gtk/plugins/win32/winprefs/winprefs.c	2006-10-08 19:17:32 UTC (rev 17451)
+++ trunk/gtk/plugins/win32/winprefs/winprefs.c	2006-10-09 03:02:32 UTC (rev 17452)
@@ -55,7 +55,6 @@
 static const char *PREF_DBLIST_HEIGHT = "/plugins/gtk/win32/winprefs/dblist_height";
 static const char *PREF_DBLIST_SIDE = "/plugins/gtk/win32/winprefs/dblist_side";
 static const char *PREF_BLIST_ON_TOP = "/plugins/gtk/win32/winprefs/blist_on_top";
-static const char *PREF_IM_BLINK = "/plugins/gtk/win32/winprefs/im_blink";
 static const char *PREF_CHAT_BLINK = "/plugins/gtk/win32/winprefs/chat_blink";
 
 /* Deprecated */
@@ -66,25 +65,12 @@
 static GtkWidget *blist = NULL;
 static guint blist_visible_cb_id = 0;
 
-/* flash info */
-
-struct _WGAIM_FLASH_INFO {
-	guint t_handle;
-	guint sig_handler;
-};
-
 enum {
 	BLIST_TOP_NEVER = 0,
 	BLIST_TOP_ALWAYS,
 	BLIST_TOP_DOCKED,
 };
 
-typedef struct _WGAIM_FLASH_INFO WGAIM_FLASH_INFO;
-
-typedef BOOL (CALLBACK* LPFNFLASHWINDOWEX)(PFLASHWINFO);
-
-static LPFNFLASHWINDOWEX MyFlashWindowEx = NULL;
-
 /*
  *  CODE
  */
@@ -247,128 +233,22 @@
 		blist_set_ontop(FALSE);
 }
 
-static void load_winver_specific_procs(void) {
-	/* Used for Win98+ and WinNT5+ */
-	MyFlashWindowEx = (LPFNFLASHWINDOWEX) wgaim_find_and_loadproc("user32.dll", "FlashWindowEx");
-}
-
-/* Window flasher */
-static gboolean flash_window_cb(gpointer data) {
-	FlashWindow((HWND) data, TRUE);
-	return TRUE;
-}
-
-static int
-halt_flash_filter(GtkWidget *widget, GdkEventFocus *event, gpointer data)
-{
-	if(MyFlashWindowEx) {
-		HWND hWnd = data;
-		FLASHWINFO info;
-
-		if(!IsWindow(hWnd))
-			return 0;
-
-		memset(&info, 0, sizeof(FLASHWINFO));
-		info.cbSize = sizeof(FLASHWINFO);
-		info.hwnd = hWnd;
-		info.dwFlags = FLASHW_STOP;
-		info.dwTimeout = 0;
-		MyFlashWindowEx(&info);
-
-	} else {
-		WGAIM_FLASH_INFO *finfo = data;
-		/* Stop flashing and remove filter */
-		gaim_debug(GAIM_DEBUG_INFO, "wgaim", "Removing timeout\n");
-		gaim_timeout_remove(finfo->t_handle);
-		gaim_debug(GAIM_DEBUG_INFO, "wgaim", "Disconnecting signal handler\n");
-		g_signal_handler_disconnect(G_OBJECT(widget),
-			finfo->sig_handler);
-		gaim_debug(GAIM_DEBUG_INFO, "wgaim", "done\n");
-		g_free(finfo);
-	}
-	return 0;
-}
-
-/* FlashWindowEx is only supported by Win98+ and WinNT5+. If it's
-   not supported we do it our own way */
 static gboolean
-wgaim_conv_blink(GaimConversation *conv, int flags)
+gtkwgaim_conv_chat_blink(GaimAccount *account, const char *who, char **message,
+		GaimConversation *conv, GaimMessageFlags flags, void *data)
 {
-	GaimGtkWindow *win;
-	GtkWidget *window;
+	if(!gaim_prefs_get_bool(PREF_CHAT_BLINK))
+		gtkwgaim_conv_blink(conv, flags);
 
-	/* Don't flash for our own messages or system messages */
-	if(flags & GAIM_MESSAGE_SEND || flags & GAIM_MESSAGE_SYSTEM)
-		return FALSE;
-
-	if(conv == NULL) {
-		gaim_debug_info("winprefs", "gar!\n");
-		return FALSE;
-	}
-	win = gaim_gtkconv_get_window(GAIM_GTK_CONVERSATION(conv));
-	if(win == NULL) {
-		gaim_debug_info("winprefs", "gar2!\n");
-		return FALSE;
-	}
-	window = win->window;
-
-	if(MyFlashWindowEx) {
-		FLASHWINFO info;
-		if(GetForegroundWindow() == GDK_WINDOW_HWND(window->window))
-			return FALSE;
-
-		memset(&info, 0, sizeof(FLASHWINFO));
-		info.cbSize = sizeof(FLASHWINFO);
-		info.hwnd = GDK_WINDOW_HWND(window->window);
-		info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
-		info.dwTimeout = 0;
-		MyFlashWindowEx(&info);
-		/* Stop flashing when window receives focus */
-		g_signal_connect(G_OBJECT(window), "focus-in-event",
-			G_CALLBACK(halt_flash_filter), info.hwnd);
-	} else {
-		WGAIM_FLASH_INFO *finfo = g_new0(WGAIM_FLASH_INFO, 1);
-
-		/* Start Flashing window */
-		finfo->t_handle = gaim_timeout_add(1000, flash_window_cb,
-			GDK_WINDOW_HWND(window->window));
-		finfo->sig_handler = g_signal_connect(G_OBJECT(window),
-			"focus-in-event", G_CALLBACK(halt_flash_filter), finfo);
-	}
-
 	return FALSE;
 }
 
-static gboolean
-wgaim_conv_im_blink(GaimAccount *account, const char *who, char **message,
-		GaimConversation *conv, int flags, void *data)
-{
-	if(!gaim_prefs_get_bool(PREF_IM_BLINK))
-		return FALSE;
 
-	return wgaim_conv_blink(conv, flags);
-
-}
-
-static gboolean
-wgaim_conv_chat_blink(GaimAccount *account, const char *who, char **message,
-		GaimConversation *conv, int flags, void *data)
-{
-	if(!gaim_prefs_get_bool(PREF_CHAT_BLINK))
-		return FALSE;
-
-	return wgaim_conv_blink(conv, flags);
-}
-
-
 /*
  *  EXPORTED FUNCTIONS
  */
 
 static gboolean plugin_load(GaimPlugin *plugin) {
-	/* Find out how to go blinky */
-	load_winver_specific_procs();
-
 	handle = plugin;
 
 	/* blist docking init */
@@ -383,13 +263,9 @@
 		plugin, GAIM_CALLBACK(blist_create_cb), NULL);
 
 	gaim_signal_connect(gaim_gtk_conversations_get_handle(),
-		"displaying-im-msg", plugin, GAIM_CALLBACK(wgaim_conv_im_blink),
+		"displaying-chat-msg", plugin, GAIM_CALLBACK(gtkwgaim_conv_chat_blink),
 		NULL);
 
-	gaim_signal_connect(gaim_gtk_conversations_get_handle(),
-		"displaying-chat-msg", plugin, GAIM_CALLBACK(wgaim_conv_chat_blink),
-		NULL);
-
 	gaim_signal_connect((void*)gaim_get_core(), "quitting", plugin,
 		GAIM_CALLBACK(gaim_quit_cb), NULL);
 
@@ -463,8 +339,6 @@
 
 	/* Conversations */
 	vbox = gaim_gtk_make_frame(ret, _("Conversations"));
-	gaim_gtk_prefs_checkbox(_("_Flash window when IMs are received"),
-							PREF_IM_BLINK, vbox);
 	gaim_gtk_prefs_checkbox(_("_Flash window when chat messages are received"),
 							PREF_CHAT_BLINK, vbox);
 
@@ -492,7 +366,7 @@
 	N_("WinGaim Options"),
 	VERSION,
 	N_("Options specific to Windows Gaim."),
-	N_("Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."),
+	N_("Provides options specific to Windows Gaim, such as buddy list docking."),
 	"Herman Bloggs <her...@ya...>",
 	GAIM_WEBSITE,
 	plugin_load,
@@ -514,7 +388,6 @@
 	gaim_prefs_add_bool(PREF_DBLIST_DOCKED, FALSE);
 	gaim_prefs_add_int(PREF_DBLIST_HEIGHT, 0);
 	gaim_prefs_add_int(PREF_DBLIST_SIDE, 0);
-	gaim_prefs_add_bool(PREF_IM_BLINK, TRUE);
 	gaim_prefs_add_bool(PREF_CHAT_BLINK, FALSE);
 
 	/* Convert old preferences */

Modified: trunk/gtk/win32/gtkwin32dep.c
===================================================================
--- trunk/gtk/win32/gtkwin32dep.c	2006-10-08 19:17:32 UTC (rev 17451)
+++ trunk/gtk/win32/gtkwin32dep.c	2006-10-09 03:02:32 UTC (rev 17452)
@@ -49,9 +49,8 @@
 #include <libintl.h>
 
 #include "gtkwin32dep.h"
-
 #include "win32dep.h"
-
+#include "gtkconv.h"
 #include "wspell.h"
 
 /*
@@ -60,7 +59,12 @@
 HINSTANCE gaimexe_hInstance = 0;
 HINSTANCE gtkgaimdll_hInstance = 0;
 HWND messagewin_hwnd;
+static int gtkwin32_handle;
 
+typedef BOOL (CALLBACK* LPFNFLASHWINDOWEX)(PFLASHWINFO);
+static LPFNFLASHWINDOWEX MyFlashWindowEx = NULL;
+
+
 /*
  *  PUBLIC CODE
  */
@@ -221,15 +225,82 @@
 	return win_hwnd;
 }
 
+static int
+halt_flash_filter(GtkWidget *widget, GdkEventFocus *event, gpointer data) {
+	if(MyFlashWindowEx) {
+		HWND hWnd = data;
+		FLASHWINFO info;
 
+		if(!IsWindow(hWnd))
+			return 0;
+
+		memset(&info, 0, sizeof(FLASHWINFO));
+		info.cbSize = sizeof(FLASHWINFO);
+		info.hwnd = hWnd;
+		info.dwFlags = FLASHW_STOP;
+		info.dwTimeout = 0;
+		MyFlashWindowEx(&info);
+	}
+	return 0;
+}
+
+void
+gtkwgaim_conv_blink(GaimConversation *conv, GaimMessageFlags flags) {
+	GaimGtkWindow *win;
+	GtkWidget *window;
+
+	/* Don't flash for our own messages or system messages */
+	if(flags & GAIM_MESSAGE_SEND || flags & GAIM_MESSAGE_SYSTEM)
+		return;
+
+	if(conv == NULL) {
+		gaim_debug_info("gtkwgaim", "No conversation found to blink.\n");
+		return;
+	}
+
+	win = gaim_gtkconv_get_window(GAIM_GTK_CONVERSATION(conv));
+	if(win == NULL) {
+		gaim_debug_info("gtkwgaim", "No conversation windows found to blink.\n");
+		return;
+	}
+
+	window = win->window;
+
+	if(MyFlashWindowEx) {
+		FLASHWINFO info;
+		/* Don't flash if we have the window focused */
+		if(GetForegroundWindow() == GDK_WINDOW_HWND(window->window))
+			return;
+
+		memset(&info, 0, sizeof(FLASHWINFO));
+		info.cbSize = sizeof(FLASHWINFO);
+		info.hwnd = GDK_WINDOW_HWND(window->window);
+		info.dwFlags = FLASHW_ALL | FLASHW_TIMER;
+		info.dwTimeout = 0;
+		MyFlashWindowEx(&info);
+		/* Stop flashing when window receives focus */
+		g_signal_connect(G_OBJECT(window), "focus-in-event",
+			G_CALLBACK(halt_flash_filter), info.hwnd);
+	}
+}
+
+static gboolean
+gtkwgaim_conv_im_blink(GaimAccount *account, const char *who, char **message,
+		GaimConversation *conv, GaimMessageFlags flags, void *data)
+{
+	gtkwgaim_conv_blink(conv, flags);
+	return FALSE;
+}
+
 void gtkwgaim_init(HINSTANCE hint) {
+
 	gaim_debug_info("gtkwgaim", "gtkwgaim_init start\n");
 
 	gaimexe_hInstance = hint;
 
 	/* IdleTracker Initialization */
 	if(!wgaim_set_idlehooks())
-			gaim_debug_error("gtkwgaim", "Failed to initialize idle tracker\n");
+		gaim_debug_error("gtkwgaim", "Failed to initialize idle tracker\n");
 
 	wgaim_gtkspell_init();
 	gaim_debug_info("gtkwgaim", "GTK+ :%u.%u.%u\n",
@@ -237,9 +308,19 @@
 
 	messagewin_hwnd = wgaim_message_window_init();
 
+	MyFlashWindowEx = (LPFNFLASHWINDOWEX) wgaim_find_and_loadproc("user32.dll", "FlashWindowEx");
+
 	gaim_debug_info("gtkwgaim", "gtkwgaim_init end\n");
 }
 
+void gtkwgaim_post_init(void) {
+
+	gaim_signal_connect(gaim_gtk_conversations_get_handle(),
+		"displaying-im-msg", &gtkwin32_handle, GAIM_CALLBACK(gtkwgaim_conv_im_blink),
+		NULL);
+
+}
+
 /* Windows Cleanup */
 
 void gtkwgaim_cleanup(void) {

Modified: trunk/gtk/win32/gtkwin32dep.h
===================================================================
--- trunk/gtk/win32/gtkwin32dep.h	2006-10-08 19:17:32 UTC (rev 17451)
+++ trunk/gtk/win32/gtkwin32dep.h	2006-10-09 03:02:32 UTC (rev 17452)
@@ -24,20 +24,23 @@
 #define _GTKWIN32DEP_H_
 #include <windows.h>
 #include <gtk/gtk.h>
+#include "conversation.h"
 
 HINSTANCE gtkwgaim_hinstance(void);
 
 /* Utility */
-int       gtkwgaim_gz_decompress(const char* in, const char* out);
-int       gtkwgaim_gz_untar(const char* filename, const char* destdir);
-void gtkwgaim_ensure_onscreen(GtkWidget *win);
+int gtkwgaim_gz_decompress(const char* in, const char* out);
+int gtkwgaim_gz_untar(const char* filename, const char* destdir);
 
 /* Misc */
-void      gtkwgaim_notify_uri(const char *uri);
+void gtkwgaim_notify_uri(const char *uri);
+void gtkwgaim_ensure_onscreen(GtkWidget *win);
+void gtkwgaim_conv_blink(GaimConversation *conv, GaimMessageFlags flags);
 
 /* init / cleanup */
-void      gtkwgaim_init(HINSTANCE);
-void      gtkwgaim_cleanup(void);
+void gtkwgaim_init(HINSTANCE);
+void gtkwgaim_post_init(void);
+void gtkwgaim_cleanup(void);
 
 #endif /* _WIN32DEP_H_ */
 

Modified: trunk/libgaim/plugins/signals-test.c
===================================================================
--- trunk/libgaim/plugins/signals-test.c	2006-10-08 19:17:32 UTC (rev 17451)
+++ trunk/libgaim/plugins/signals-test.c	2006-10-09 03:02:32 UTC (rev 17452)
@@ -243,7 +243,7 @@
 
 static gboolean
 receiving_im_msg_cb(GaimAccount *account, char **sender, char **buffer,
-				    GaimConversation *conv, int *flags, void *data)
+				    GaimConversation *conv, GaimMessageFlags *flags, void *data)
 {
 	gaim_debug_misc("signals test", "receiving-im-msg (%s, %s, %s, %s, %d)\n",
 					gaim_account_get_username(account), *sender, *buffer,
@@ -254,7 +254,7 @@
 
 static void
 received_im_msg_cb(GaimAccount *account, char *sender, char *buffer,
-				   GaimConversation *conv, int flags, void *data)
+				   GaimConversation *conv, GaimMessageFlags flags, void *data)
 {
 	gaim_debug_misc("signals test", "received-im-msg (%s, %s, %s, %s, %d)\n",
 					gaim_account_get_username(account), sender, buffer,
@@ -297,7 +297,7 @@
 
 static gboolean
 receiving_chat_msg_cb(GaimAccount *account, char **sender, char **buffer,
-					 GaimConversation *chat, int *flags, void *data)
+					 GaimConversation *chat, GaimMessageFlags *flags, void *data)
 {
 	gaim_debug_misc("signals test",
 					"receiving-chat-msg (%s, %s, %s, %s, %d)\n",
@@ -309,7 +309,7 @@
 
 static void
 received_chat_msg_cb(GaimAccount *account, char *sender, char *buffer,
-					 GaimConversation *chat, int flags, void *data)
+					 GaimConversation *chat, GaimMessageFlags flags, void *data)
 {
 	gaim_debug_misc("signals test",
 					"received-chat-msg (%s, %s, %s, %s, %d)\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: [17451] trunk

From: <dat...@us...> - 2006-10-08 19:17:39

Revision: 17451
          http://svn.sourceforge.net/gaim/?rev=17451&view=rev
Author:   datallah
Date:     2006-10-08 12:17:32 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
A couple Makefile.mingw tweaks from Lee Roach.
`make -f Makefile.mingw clean` will no longer delete win32-install-dir, a new "uninstall" target has been added for that purpose.
The perl Makefiles "clean" target will now delete .c files generated from the .xs files.

Modified Paths:
--------------
    trunk/Makefile.mingw
    trunk/gtk/plugins/perl/common/Makefile.mingw
    trunk/libgaim/plugins/perl/common/Makefile.mingw

Modified: trunk/Makefile.mingw
===================================================================
--- trunk/Makefile.mingw	2006-10-08 17:44:10 UTC (rev 17450)
+++ trunk/Makefile.mingw	2006-10-08 19:17:32 UTC (rev 17451)
@@ -31,7 +31,7 @@
     exit; \
 }' VERSION)
 
-.PHONY: all install installer installer_nogtk installer_debug installers clean
+.PHONY: all install installer installer_nogtk installer_debug installers clean uninstall
 
 all: $(GAIM_CONFIG_H)
 	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE)
@@ -59,6 +59,8 @@
 	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
 	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
 	rm -f $(GAIM_CONFIG_H) gaim*.exe
+
+uninstall:
 	rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR)
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/gtk/plugins/perl/common/Makefile.mingw
===================================================================
--- trunk/gtk/plugins/perl/common/Makefile.mingw	2006-10-08 17:44:10 UTC (rev 17450)
+++ trunk/gtk/plugins/perl/common/Makefile.mingw	2006-10-08 19:17:32 UTC (rev 17451)
@@ -104,6 +104,6 @@
 ## CLEAN
 ##
 clean:
-	rm -f *.o $(TARGET).dll
+	rm -f *.o $(C_FILES) $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/plugins/perl/common/Makefile.mingw
===================================================================
--- trunk/libgaim/plugins/perl/common/Makefile.mingw	2006-10-08 17:44:10 UTC (rev 17450)
+++ trunk/libgaim/plugins/perl/common/Makefile.mingw	2006-10-08 19:17:32 UTC (rev 17451)
@@ -110,6 +110,7 @@
 ## CLEAN
 ##
 clean:
-	rm -rf *.o $(TARGET).dll $(FALLBACKS) lib
+	rm -rf $(TARGET).dll $(FALLBACKS) lib
+	rm -f *.o $(C_FILES)
 
 include $(GAIM_COMMON_TARGETS)


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

6 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 26 27 28 29 30 .. 860 > >> (Page 28 of 860)