pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [17278] trunk/libgaim/protocols

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

Revision: 17278
          http://svn.sourceforge.net/gaim/?rev=17278&view=rev
Author:   datallah
Date:     2006-09-14 12:37:46 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
Allow `make -f Makefile.mingw` to work directly from the prpl directories.

Modified Paths:
--------------
    trunk/libgaim/protocols/bonjour/Makefile.mingw
    trunk/libgaim/protocols/gg/Makefile.mingw
    trunk/libgaim/protocols/irc/Makefile.mingw
    trunk/libgaim/protocols/jabber/Makefile.mingw
    trunk/libgaim/protocols/msn/Makefile.mingw
    trunk/libgaim/protocols/novell/Makefile.mingw
    trunk/libgaim/protocols/oscar/Makefile.mingw
    trunk/libgaim/protocols/sametime/Makefile.mingw
    trunk/libgaim/protocols/silc/Makefile.mingw
    trunk/libgaim/protocols/simple/Makefile.mingw
    trunk/libgaim/protocols/toc/Makefile.mingw
    trunk/libgaim/protocols/yahoo/Makefile.mingw
    trunk/libgaim/protocols/zephyr/Makefile.mingw

Modified: trunk/libgaim/protocols/bonjour/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/bonjour/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/bonjour/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -9,6 +9,7 @@
 
 TARGET = libbonjour
 NEEDED_DLLS = $(HOWL_TOP)/bin/libhowl-1.dll
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -79,7 +80,7 @@
 ##
 
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/gg/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/gg/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/gg/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -9,6 +9,7 @@
 
 TARGET = libgg
 CFLAGS += -include win32dep.h
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -59,8 +60,6 @@
 ##
 LIBS =	\
 			-lglib-2.0 \
-			-lgmodule-2.0 \
-			-lgobject-2.0 \
 			-lintl \
 			-lgaim \
 			-lws2_32
@@ -86,7 +85,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/irc/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/irc/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/irc/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libirc
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -49,7 +50,6 @@
 ##
 LIBS =	\
 			-lglib-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lgaim
@@ -79,7 +79,7 @@
 ##
 
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/jabber/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/jabber/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/jabber/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libjabber
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -88,7 +89,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/msn/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/msn/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/msn/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,8 +8,9 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libmsn
+TYPE = PLUGIN
 
-# Static or Plugin... 
+# Static or Plugin...
 ifeq ($(TYPE),STATIC)
   DEFINES += -DSTATIC
   DLL_INSTALL_DIR =	$(GAIM_INSTALL_DIR)
@@ -98,7 +99,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/novell/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/novell/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/novell/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libnovell
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -81,7 +82,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/oscar/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/oscar/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/oscar/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = liboscar
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -104,7 +105,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/sametime/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/sametime/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/sametime/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -9,6 +9,7 @@
 
 TARGET = libsametime
 NEEDED_DLLS = $(MEANWHILE_TOP)/bin/libmeanwhile-1.dll
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -76,7 +77,7 @@
 ##
 
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/silc/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/silc/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/silc/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -10,6 +10,7 @@
 TARGET = libsilc
 NEEDED_DLLS =		$(SILC_TOOLKIT)/lib/silc.dll \
 			$(SILC_TOOLKIT)/lib/silcclient.dll
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -84,7 +85,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/simple/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/simple/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/simple/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libsimple
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -46,7 +47,6 @@
 ##
 LIBS =	\
 			-lglib-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lgaim
@@ -72,7 +72,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/toc/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/toc/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/toc/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libtoc
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -71,7 +72,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/yahoo/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/yahoo/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/yahoo/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -8,6 +8,7 @@
 include $(GAIM_TOP)/libgaim/win32/global.mak
 
 TARGET = libyahoo
+TYPE = PLUGIN
 
 # Static or Plugin...
 ifeq ($(TYPE),STATIC)
@@ -56,7 +57,6 @@
 ##
 LIBS =			\
 			-lglib-2.0 \
-			-lgobject-2.0 \
 			-lws2_32 \
 			-lintl \
 			-lgaim
@@ -83,7 +83,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)

Modified: trunk/libgaim/protocols/zephyr/Makefile.mingw
===================================================================
--- trunk/libgaim/protocols/zephyr/Makefile.mingw	2006-09-14 19:26:04 UTC (rev 17277)
+++ trunk/libgaim/protocols/zephyr/Makefile.mingw	2006-09-14 19:37:46 UTC (rev 17278)
@@ -11,6 +11,7 @@
 KRB4_TOP := $(WIN32_DEV_TOP)/kfw-2.6.3-final.fixed
 USE_KRB4 := false
 DEFINES += -DWIN32 -DKRB5_SYSTYPES__
+TYPE = PLUGIN
 
 ifeq ($(USE_KRB4),true)
   DEFINES += -DZEPHYR_USES_KERBEROS
@@ -142,7 +143,7 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -rf $(OBJECTS)
-	rm -rf $(TARGET).dll
+	rm -f $(OBJECTS)
+	rm -f $(TARGET).dll
 
 include $(GAIM_COMMON_TARGETS)


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

[Gaim-commits] SF.net SVN: gaim: [17692] trunk/libgaim/protocols

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

Revision: 17692
          http://svn.sourceforge.net/gaim/?rev=17692&view=rev
Author:   rlaager
Date:     2006-11-06 21:52:41 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
Change a couple of protocols to use the more common "Incorrect password." string.
The Novell prpl has an "Invalid password" string, which probably means the same
thing, but I'm not 100% sure.  Ideally, we'd get that changed, too.

Modified Paths:
--------------
    trunk/libgaim/protocols/qq/login_logout.c
    trunk/libgaim/protocols/simple/simple.c

Modified: trunk/libgaim/protocols/qq/login_logout.c
===================================================================
--- trunk/libgaim/protocols/qq/login_logout.c	2006-11-07 02:59:24 UTC (rev 17691)
+++ trunk/libgaim/protocols/qq/login_logout.c	2006-11-07 05:52:41 UTC (rev 17692)
@@ -476,7 +476,7 @@
 	switch (ret) {
 	case QQ_LOGIN_REPLY_PWD_ERROR:
 		gc->wants_to_die = TRUE;
-		gaim_connection_error(gc, _("Wrong password!"));
+		gaim_connection_error(gc, _("Incorrect password."));
 		break;
 	case QQ_LOGIN_REPLY_MISC_ERROR:
 		gaim_connection_error(gc, _("Unable to login, check debug log"));

Modified: trunk/libgaim/protocols/simple/simple.c
===================================================================
--- trunk/libgaim/protocols/simple/simple.c	2006-11-07 02:59:24 UTC (rev 17691)
+++ trunk/libgaim/protocols/simple/simple.c	2006-11-07 05:52:41 UTC (rev 17692)
@@ -1032,7 +1032,7 @@
 				gaim_debug_info("simple", "REGISTER retries %d\n", sip->registrar.retries);
 				if(sip->registrar.retries > 3) {
 					sip->gc->wants_to_die = TRUE;
-					gaim_connection_error(sip->gc, _("Wrong Password"));
+					gaim_connection_error(sip->gc, _("Incorrect password."));
 					return TRUE;
 				}
 				tmp = sipmsg_find_header(msg, "WWW-Authenticate");


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

[Gaim-commits] SF.net SVN: gaim: [17779] trunk/libgaim/protocols

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

Revision: 17779
          http://svn.sourceforge.net/gaim/?rev=17779&view=rev
Author:   rlaager
Date:     2006-11-18 23:00:25 -0800 (Sat, 18 Nov 2006)

Log Message:
-----------
I'm committing this to get it out of my tree...

As mentioned on gaim-devel, this normalizes some stuff.  Mark wants to standardize on "username" instead.  For recognition purposes, I'd prefer that, but using "screen name" is potentially useful in that users might not enter their OS username.  In any case, it's not a huge deal to me either way.  I believe the consensus before was for "screen name", and barring a consensus to change, "screen name" is the status quo anyway, so I'm making things consistent.

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/error.c
    trunk/libgaim/protocols/novell/nmuser.c
    trunk/libgaim/protocols/simple/simple.c
    trunk/libgaim/protocols/toc/toc.c
    trunk/libgaim/protocols/yahoo/yahoo.c

Modified: trunk/libgaim/protocols/msn/error.c
===================================================================
--- trunk/libgaim/protocols/msn/error.c	2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/msn/error.c	2006-11-19 07:00:25 UTC (rev 17779)
@@ -46,19 +46,19 @@
 			break;
 		case 206:
 			g_snprintf(msg, sizeof(msg),
-					   _("Fully Qualified Domain Name missing"));
+					   _("Fully qualified domain name missing"));
 			break;
 		case 207:
-			g_snprintf(msg, sizeof(msg), _("Already Logged In"));
+			g_snprintf(msg, sizeof(msg), _("Already logged in"));
 			break;
 		case 208:
-			g_snprintf(msg, sizeof(msg), _("Invalid Username"));
+			g_snprintf(msg, sizeof(msg), _("Invalid screen name"));
 			break;
 		case 209:
-			g_snprintf(msg, sizeof(msg), _("Invalid Friendly Name"));
+			g_snprintf(msg, sizeof(msg), _("Invalid friendly name"));
 			break;
 		case 210:
-			g_snprintf(msg, sizeof(msg), _("List Full"));
+			g_snprintf(msg, sizeof(msg), _("List full"));
 			break;
 		case 215:
 			g_snprintf(msg, sizeof(msg), _("Already there"));
@@ -99,7 +99,7 @@
 			g_snprintf(msg, sizeof(msg), _("Switchboard failed"));
 			break;
 		case 281:
-			g_snprintf(msg, sizeof(msg), _("Notify Transfer failed"));
+			g_snprintf(msg, sizeof(msg), _("Notify transfer failed"));
 			break;
 
 		case 300:
@@ -113,7 +113,7 @@
 			break;
 
 		case 500:
-			g_snprintf(msg, sizeof(msg), _("Service Temporarily Unavailable"));
+			g_snprintf(msg, sizeof(msg), _("Service temporarily unavailable"));
 			break;
 		case 501:
 			g_snprintf(msg, sizeof(msg), _("Database server error"));
@@ -138,7 +138,7 @@
 			g_snprintf(msg, sizeof(msg), _("Server unavailable"));
 			break;
 		case 602:
-			g_snprintf(msg, sizeof(msg), _("Peer Notification server down"));
+			g_snprintf(msg, sizeof(msg), _("Peer notification server down"));
 			break;
 		case 603:
 			g_snprintf(msg, sizeof(msg), _("Database connect error"));

Modified: trunk/libgaim/protocols/novell/nmuser.c
===================================================================
--- trunk/libgaim/protocols/novell/nmuser.c	2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/novell/nmuser.c	2006-11-19 07:00:25 UTC (rev 17779)
@@ -1906,7 +1906,7 @@
 			return _("Password has expired");
 
 		case NMERR_PASSWORD_INVALID:
-			return _("Invalid password");
+			return _("Incorrect password");
 
 		case NMERR_USER_NOT_FOUND:
 			return _("User not found");
@@ -1934,13 +1934,13 @@
 
 		case NMERR_AUTHENTICATION_FAILED:
 		case NMERR_CREDENTIALS_MISSING:
-			return _("Invalid username or password");
+			return _("Incorrect screen name or password");
 
 		case NMERR_HOST_NOT_FOUND:
-			return _("Could not recognize the host of the username you entered");
+			return _("Could not recognize the host of the screen name you entered");
 
 		case NMERR_ACCESS_DENIED:
-			return _("Your account has been disabled because too many invalid passwords were entered");
+			return _("Your account has been disabled because too many incorrect passwords were entered");
 
 		case NMERR_DUPLICATE_PARTICIPANT:
 			return _("You cannot add the same person twice to a conversation");
@@ -1950,7 +1950,7 @@
 			return _("You have reached your limit for the number of contacts allowed");
 
 		case NMERR_OBJECT_NOT_FOUND:
-			return _("You have entered an invalid username");
+			return _("You have entered an incorrect screen name");
 
 		case NMERR_DIRECTORY_UPDATE:
 			return _("An error occurred while updating the directory");

Modified: trunk/libgaim/protocols/simple/simple.c
===================================================================
--- trunk/libgaim/protocols/simple/simple.c	2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/simple/simple.c	2006-11-19 07:00:25 UTC (rev 17779)
@@ -1644,7 +1644,7 @@
 
 	if (strpbrk(username, " \t\v\r\n") != NULL) {
 		gc->wants_to_die = TRUE;
-		gaim_connection_error(gc, _("SIP usernames may not contain whitespaces or @ symbols"));
+		gaim_connection_error(gc, _("SIP screen names may not contain whitespaces or @ symbols"));
 		return;
 	}
 

Modified: trunk/libgaim/protocols/toc/toc.c
===================================================================
--- trunk/libgaim/protocols/toc/toc.c	2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/toc/toc.c	2006-11-19 07:00:25 UTC (rev 17779)
@@ -546,7 +546,7 @@
 			g_snprintf(buf, sizeof(buf), _("Failure unknown: %s."), w);
 			break;
 		case 980:
-			g_snprintf(buf, sizeof(buf), _("Incorrect nickname or password."));
+			g_snprintf(buf, sizeof(buf), _("Incorrect screen name or password."));
 			break;
 		case 981:
 			g_snprintf(buf, sizeof(buf), _("The service is temporarily unavailable."));

Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c	2006-11-19 06:54:38 UTC (rev 17778)
+++ trunk/libgaim/protocols/yahoo/yahoo.c	2006-11-19 07:00:25 UTC (rev 17779)
@@ -1902,7 +1902,7 @@
 
 	switch (err) {
 	case 3:
-		msg = g_strdup(_("Invalid username."));
+		msg = g_strdup(_("Invalid screen name."));
 		break;
 	case 13:
 		if (!yd->wm) {


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

[Gaim-commits] SF.net SVN: gaim: [17905] trunk/libgaim/protocols

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

Revision: 17905
          http://svn.sourceforge.net/gaim/?rev=17905&view=rev
Author:   thekingant
Date:     2006-12-06 19:37:13 -0800 (Wed, 06 Dec 2006)

Log Message:
-----------
I think gdk pixbuf recognizes "jpeg" and not "jpg"

Also, is there any reason that Gaim didn't think that
gif and jpeg were valid for msn and yahoo?  It seems
like that would cause us to convert people's icons
to pngs, with possible negative consequences

Modified Paths:
--------------
    trunk/libgaim/protocols/jabber/jabber.c
    trunk/libgaim/protocols/msn/msn.c
    trunk/libgaim/protocols/yahoo/yahoo.c

Modified: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c	2006-12-07 02:48:08 UTC (rev 17904)
+++ trunk/libgaim/protocols/jabber/jabber.c	2006-12-07 03:37:13 UTC (rev 17905)
@@ -1844,7 +1844,7 @@
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME,
 	NULL,							/* user_splits */
 	NULL,							/* protocol_options */
-	{"png,jpg,gif", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */
+	{"png,gif,jpeg", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND | GAIM_ICON_SCALE_DISPLAY}, /* icon_spec */
 	jabber_list_icon,				/* list_icon */
 	jabber_list_emblems,			/* list_emblems */
 	jabber_status_text,				/* status_text */

Modified: trunk/libgaim/protocols/msn/msn.c
===================================================================
--- trunk/libgaim/protocols/msn/msn.c	2006-12-07 02:48:08 UTC (rev 17904)
+++ trunk/libgaim/protocols/msn/msn.c	2006-12-07 03:37:13 UTC (rev 17905)
@@ -1955,7 +1955,7 @@
 	OPT_PROTO_MAIL_CHECK,
 	NULL,					/* user_splits */
 	NULL,					/* protocol_options */
-	{"png", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND},	/* icon_spec */
+	{"png,gif,jpeg", 0, 0, 96, 96, GAIM_ICON_SCALE_SEND},	/* icon_spec */
 	msn_list_icon,			/* list_icon */
 	msn_list_emblems,		/* list_emblems */
 	msn_status_text,		/* status_text */

Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c	2006-12-07 02:48:08 UTC (rev 17904)
+++ trunk/libgaim/protocols/yahoo/yahoo.c	2006-12-07 03:37:13 UTC (rev 17905)
@@ -3821,7 +3821,7 @@
 	OPT_PROTO_MAIL_CHECK | OPT_PROTO_CHAT_TOPIC,
 	NULL, /* user_splits */
 	NULL, /* protocol_options */
-	{"png", 96, 96, 96, 96, GAIM_ICON_SCALE_SEND},
+	{"png,gif,jpeg", 96, 96, 96, 96, GAIM_ICON_SCALE_SEND},
 	yahoo_list_icon,
 	yahoo_list_emblems,
 	yahoo_status_text,


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

[Gaim-commits] SF.net SVN: gaim: [17928] trunk/libgaim/protocols

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

Revision: 17928
          http://svn.sourceforge.net/gaim/?rev=17928&view=rev
Author:   thekingant
Date:     2006-12-09 12:20:17 -0800 (Sat, 09 Dec 2006)

Log Message:
-----------
Get rid of a few small compile warnings

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/userlist.c
    trunk/libgaim/protocols/oscar/oscar.c
    trunk/libgaim/protocols/yahoo/yahoo.c

Modified: trunk/libgaim/protocols/msn/userlist.c
===================================================================
--- trunk/libgaim/protocols/msn/userlist.c	2006-12-09 20:11:43 UTC (rev 17927)
+++ trunk/libgaim/protocols/msn/userlist.c	2006-12-09 20:20:17 UTC (rev 17928)
@@ -74,7 +74,7 @@
 	pa->gc = gc;
 	
 	gaim_account_request_authorization(gaim_connection_get_account(gc), passport, NULL, friendly, NULL,
-					   gaim_find_buddy(gaim_connection_get_account(gc), passport),
+					   gaim_find_buddy(gaim_connection_get_account(gc), passport) != NULL,
 					   G_CALLBACK(msn_accept_add_cb), G_CALLBACK(msn_cancel_add_cb), pa);
 }
 

Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c	2006-12-09 20:11:43 UTC (rev 17927)
+++ trunk/libgaim/protocols/oscar/oscar.c	2006-12-09 20:20:17 UTC (rev 17928)
@@ -2330,8 +2330,9 @@
 				data->name = sn;
 				data->nick = NULL;
 
-				gaim_account_request_authorization(account, sn,
-						NULL, NULL, reason, gaim_find_buddy(account, sn), G_CALLBACK(gaim_auth_grant),
+				gaim_account_request_authorization(account, sn, NULL, NULL,
+						reason, gaim_find_buddy(account, sn) != NULL,
+						G_CALLBACK(gaim_auth_grant),
 						G_CALLBACK(gaim_auth_dontgrant_msgprompt), data);
 				g_free(reason);
 			}
@@ -5042,8 +5043,8 @@
 	data->name = g_strdup(sn);
 	data->nick = NULL;
 
-	gaim_account_request_authorization(account, nombre,
-			NULL, NULL, reason, buddy, G_CALLBACK(gaim_auth_grant),
+	gaim_account_request_authorization(account, nombre, NULL, NULL,
+			reason, buddy != NULL, G_CALLBACK(gaim_auth_grant),
 			G_CALLBACK(gaim_auth_dontgrant_msgprompt), data);
 	g_free(nombre);
 	g_free(reason);

Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c	2006-12-09 20:11:43 UTC (rev 17927)
+++ trunk/libgaim/protocols/yahoo/yahoo.c	2006-12-09 20:20:17 UTC (rev 17928)
@@ -996,7 +996,7 @@
 		 * this should probably be moved to the core.
 		 */
 		 gaim_account_request_authorization(gaim_connection_get_account(gc), add_req->who, add_req->id,
-                                                    NULL, add_req->msg, gaim_find_buddy(gaim_connection_get_account(gc),add_req->who),
+                                                    NULL, add_req->msg, gaim_find_buddy(gaim_connection_get_account(gc),add_req->who) != NULL,
 						    G_CALLBACK(yahoo_buddy_add_authorize_cb), 
 						    G_CALLBACK(yahoo_buddy_add_deny_reason_cb),
                                                     add_req);


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