Menu
▾
▴
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
|
|
From: <nos...@us...> - 2006-09-29 20:48:49
|
Revision: 17400
http://svn.sourceforge.net/gaim/?rev=17400&view=rev
Author: nosnilmot
Date: 2006-09-29 13:48:45 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
extplacement is a gtk plugin, so use GTK_LIBS
Modified Paths:
--------------
trunk/gtk/plugins/Makefile.am
Modified: trunk/gtk/plugins/Makefile.am
===================================================================
--- trunk/gtk/plugins/Makefile.am 2006-09-29 20:45:50 UTC (rev 17399)
+++ trunk/gtk/plugins/Makefile.am 2006-09-29 20:48:45 UTC (rev 17400)
@@ -27,7 +27,7 @@
plugindir = $(libdir)/gaim
-extplacement_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
+extplacement_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
gaimrc_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
history_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
iconaway_la_LDFLAGS = -module -avoid-version $(GTK_LIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nos...@us...> - 2006-09-29 20:46:06
|
Revision: 17399
http://svn.sourceforge.net/gaim/?rev=17399&view=rev
Author: nosnilmot
Date: 2006-09-29 13:45:50 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
intltool support for translating the gaim.schemas file
Modified Paths:
--------------
trunk/libgaim/gconf/Makefile.am
trunk/po/POTFILES.in
Added Paths:
-----------
trunk/libgaim/gconf/gaim.schemas.in
Removed Paths:
-------------
trunk/libgaim/gconf/gaim.schemas
Property Changed:
----------------
trunk/libgaim/gconf/
Property changes on: trunk/libgaim/gconf
___________________________________________________________________
Name: svn:ignore
- Makefile
Makefile.in
+ Makefile
Makefile.in
gaim.schemas
Modified: trunk/libgaim/gconf/Makefile.am
===================================================================
--- trunk/libgaim/gconf/Makefile.am 2006-09-29 20:22:46 UTC (rev 17398)
+++ trunk/libgaim/gconf/Makefile.am 2006-09-29 20:45:50 UTC (rev 17399)
@@ -1,8 +1,11 @@
schemadir = @GCONF_SCHEMA_FILE_DIR@
-schema_DATA = gaim.schemas
-EXTRA_DIST = gaim.schemas
+EXTRA_DIST = gaim.schemas.in
+schema_in_files = gaim.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+@INTLTOOL_SCHEMAS_RULE@
+
if GCONF_SCHEMAS_INSTALL
install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
Deleted: trunk/libgaim/gconf/gaim.schemas
===================================================================
--- trunk/libgaim/gconf/gaim.schemas 2006-09-29 20:22:46 UTC (rev 17398)
+++ trunk/libgaim/gconf/gaim.schemas 2006-09-29 20:45:50 UTC (rev 17399)
@@ -1,276 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
- <schemalist>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/aim/enabled</key>
- <applyto>/desktop/gnome/url-handlers/aim/enabled</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether the specified command should handle "aim" URLs</short>
- <long>True if the command specified in the "command" key should handle "aim" URLs.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/aim/command</key>
-im <applyto>/desktop/gnome/url-handlers/aim/command</applyto>
- <owner>gaim</owner>
- <type>string</type>
- <default>gaim-url-handler "%s"</default>
- <locale name="C">
- <short>The handler for "aim" URLs</short>
- <long>The command used to handle "aim" URLs, if enabled.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/aim/needs_terminal</key>
- <applyto>/desktop/gnome/url-handlers/aim/needs_terminal</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run the command in a terminal</short>
- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/gg/enabled</key>
- <applyto>/desktop/gnome/url-handlers/gg/enabled</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether the specified command should handle "gg" URLs</short>
- <long>True if the command specified in the "command" key should handle "gg" URLs.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/gg/command</key>
- <applyto>/desktop/gnome/url-handlers/gg/command</applyto>
- <owner>gaim</owner>
- <type>string</type>
- <default>gaim-url-handler "%s"</default>
- <locale name="C">
- <short>The handler for "gg" URLs</short>
- <long>The command used to handle "gg" URLs, if enabled.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/gg/needs_terminal</key>
- <applyto>/desktop/gnome/url-handlers/gg/needs_terminal</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run the command in a terminal</short>
- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/icq/enabled</key>
- <applyto>/desktop/gnome/url-handlers/icq/enabled</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether the specified command should handle "icq" URLs</short>
- <long>True if the command specified in the "command" key should handle "icq" URLs.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/icq/command</key>
- <applyto>/desktop/gnome/url-handlers/icq/command</applyto>
- <owner>gaim</owner>
- <type>string</type>
- <default>gaim-url-handler "%s"</default>
- <locale name="C">
- <short>The handler for "icq" URLs</short>
- <long>The command used to handle "icq" URLs, if enabled.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/icq/needs_terminal</key>
- <applyto>/desktop/gnome/url-handlers/icq/needs_terminal</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run the command in a terminal</short>
- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/irc/enabled</key>
- <applyto>/desktop/gnome/url-handlers/irc/enabled</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether the specified command should handle "irc" URLs</short>
- <long>True if the command specified in the "command" key should handle "irc" URLs.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/irc/command</key>
- <applyto>/desktop/gnome/url-handlers/irc/command</applyto>
- <owner>gaim</owner>
- <type>string</type>
- <default>gaim-url-handler "%s"</default>
- <locale name="C">
- <short>The handler for "irc" URLs</short>
- <long>The command used to handle "irc" URLs, if enabled.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key>
- <applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run the command in a terminal</short>
- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/msnim/enabled</key>
- <applyto>/desktop/gnome/url-handlers/msnim/enabled</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether the specified command should handle "msnim" URLs</short>
- <long>True if the command specified in the "command" key should handle "msnim" URLs.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/msnim/command</key>
- <applyto>/desktop/gnome/url-handlers/msnim/command</applyto>
- <owner>gaim</owner>
- <type>string</type>
- <default>gaim-url-handler "%s"</default>
- <locale name="C">
- <short>The handler for "msnim" URLs</short>
- <long>The command used to handle "msnim" URLs, if enabled.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/msnim/needs_terminal</key>
- <applyto>/desktop/gnome/url-handlers/msnim/needs_terminal</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run the command in a terminal</short>
- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/sip/enabled</key>
- <applyto>/desktop/gnome/url-handlers/sip/enabled</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether the specified command should handle "sip" URLs</short>
- <long>True if the command specified in the "command" key should handle "sip" URLs.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/sip/command</key>
- <applyto>/desktop/gnome/url-handlers/sip/command</applyto>
- <owner>gaim</owner>
- <type>string</type>
- <default>gaim-url-handler "%s"</default>
- <locale name="C">
- <short>The handler for "sip" URLs</short>
- <long>The command used to handle "sip" URLs, if enabled.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/sip/needs_terminal</key>
- <applyto>/desktop/gnome/url-handlers/sip/needs_terminal</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run the command in a terminal</short>
- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/xmpp/enabled</key>
- <applyto>/desktop/gnome/url-handlers/xmpp/enabled</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether the specified command should handle "xmpp" URLs</short>
- <long>True if the command specified in the "command" key should handle "xmpp" URLs.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/xmpp/command</key>
- <applyto>/desktop/gnome/url-handlers/xmpp/command</applyto>
- <owner>gaim</owner>
- <type>string</type>
- <default>gaim-url-handler "%s"</default>
- <locale name="C">
- <short>The handler for "xmpp" URLs</short>
- <long>The command used to handle "xmpp" URLs, if enabled.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal</key>
- <applyto>/desktop/gnome/url-handlers/xmpp/needs_terminal</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run the command in a terminal</short>
- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/ymsgr/enabled</key>
- <applyto>/desktop/gnome/url-handlers/ymsgr/enabled</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>true</default>
- <locale name="C">
- <short>Whether the specified command should handle "ymsgr" URLs</short>
- <long>True if the command specified in the "command" key should handle "ymsgr" URLs.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/ymsgr/command</key>
- <applyto>/desktop/gnome/url-handlers/ymsgr/command</applyto>
- <owner>gaim</owner>
- <type>string</type>
- <default>gaim-url-handler "%s"</default>
- <locale name="C">
- <short>The handler for "ymsgr" URLs</short>
- <long>The command used to handle "ymsgr" URLs, if enabled.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal</key>
- <applyto>/desktop/gnome/url-handlers/ymsgr/needs_terminal</applyto>
- <owner>gaim</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Run the command in a terminal</short>
- <long>True if the command used to handle this type of URL should be run in a terminal.</long>
- </locale>
- </schema>
- </schemalist>
-</gconfschemafile>
Copied: trunk/libgaim/gconf/gaim.schemas.in (from rev 17398, trunk/libgaim/gconf/gaim.schemas)
===================================================================
--- trunk/libgaim/gconf/gaim.schemas.in (rev 0)
+++ trunk/libgaim/gconf/gaim.schemas.in 2006-09-29 20:45:50 UTC (rev 17399)
@@ -0,0 +1,276 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+ <schemalist>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/aim/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/aim/enabled</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "aim" URLs</short>
+ <long>True if the command specified in the "command" key should handle "aim" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/aim/command</key>
+ <applyto>/desktop/gnome/url-handlers/aim/command</applyto>
+ <owner>gaim</owner>
+ <type>string</type>
+ <default>gaim-url-handler "%s"</default>
+ <locale name="C">
+ <short>The handler for "aim" URLs</short>
+ <long>The command used to handle "aim" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/aim/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/aim/needs_terminal</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/gg/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/gg/enabled</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "gg" URLs</short>
+ <long>True if the command specified in the "command" key should handle "gg" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/gg/command</key>
+ <applyto>/desktop/gnome/url-handlers/gg/command</applyto>
+ <owner>gaim</owner>
+ <type>string</type>
+ <default>gaim-url-handler "%s"</default>
+ <locale name="C">
+ <short>The handler for "gg" URLs</short>
+ <long>The command used to handle "gg" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/gg/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/gg/needs_terminal</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/icq/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/icq/enabled</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "icq" URLs</short>
+ <long>True if the command specified in the "command" key should handle "icq" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/icq/command</key>
+ <applyto>/desktop/gnome/url-handlers/icq/command</applyto>
+ <owner>gaim</owner>
+ <type>string</type>
+ <default>gaim-url-handler "%s"</default>
+ <locale name="C">
+ <short>The handler for "icq" URLs</short>
+ <long>The command used to handle "icq" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/icq/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/icq/needs_terminal</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/irc/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/irc/enabled</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "irc" URLs</short>
+ <long>True if the command specified in the "command" key should handle "irc" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/irc/command</key>
+ <applyto>/desktop/gnome/url-handlers/irc/command</applyto>
+ <owner>gaim</owner>
+ <type>string</type>
+ <default>gaim-url-handler "%s"</default>
+ <locale name="C">
+ <short>The handler for "irc" URLs</short>
+ <long>The command used to handle "irc" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/irc/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/irc/needs_terminal</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/msnim/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/msnim/enabled</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "msnim" URLs</short>
+ <long>True if the command specified in the "command" key should handle "msnim" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/msnim/command</key>
+ <applyto>/desktop/gnome/url-handlers/msnim/command</applyto>
+ <owner>gaim</owner>
+ <type>string</type>
+ <default>gaim-url-handler "%s"</default>
+ <locale name="C">
+ <short>The handler for "msnim" URLs</short>
+ <long>The command used to handle "msnim" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/msnim/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/msnim/needs_terminal</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/sip/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/sip/enabled</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "sip" URLs</short>
+ <long>True if the command specified in the "command" key should handle "sip" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/sip/command</key>
+ <applyto>/desktop/gnome/url-handlers/sip/command</applyto>
+ <owner>gaim</owner>
+ <type>string</type>
+ <default>gaim-url-handler "%s"</default>
+ <locale name="C">
+ <short>The handler for "sip" URLs</short>
+ <long>The command used to handle "sip" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/sip/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/sip/needs_terminal</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/xmpp/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/xmpp/enabled</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "xmpp" URLs</short>
+ <long>True if the command specified in the "command" key should handle "xmpp" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/xmpp/command</key>
+ <applyto>/desktop/gnome/url-handlers/xmpp/command</applyto>
+ <owner>gaim</owner>
+ <type>string</type>
+ <default>gaim-url-handler "%s"</default>
+ <locale name="C">
+ <short>The handler for "xmpp" URLs</short>
+ <long>The command used to handle "xmpp" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/xmpp/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/xmpp/needs_terminal</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+ </locale>
+ </schema>
+
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/ymsgr/enabled</key>
+ <applyto>/desktop/gnome/url-handlers/ymsgr/enabled</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>true</default>
+ <locale name="C">
+ <short>Whether the specified command should handle "ymsgr" URLs</short>
+ <long>True if the command specified in the "command" key should handle "ymsgr" URLs.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/ymsgr/command</key>
+ <applyto>/desktop/gnome/url-handlers/ymsgr/command</applyto>
+ <owner>gaim</owner>
+ <type>string</type>
+ <default>gaim-url-handler "%s"</default>
+ <locale name="C">
+ <short>The handler for "ymsgr" URLs</short>
+ <long>The command used to handle "ymsgr" URLs, if enabled.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/desktop/gnome/url-handlers/ymsgr/needs_terminal</key>
+ <applyto>/desktop/gnome/url-handlers/ymsgr/needs_terminal</applyto>
+ <owner>gaim</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Run the command in a terminal</short>
+ <long>True if the command used to handle this type of URL should be run in a terminal.</long>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2006-09-29 20:22:46 UTC (rev 17398)
+++ trunk/po/POTFILES.in 2006-09-29 20:45:50 UTC (rev 17399)
@@ -93,6 +93,7 @@
libgaim/dbus-server.c
libgaim/dnsquery.c
libgaim/ft.c
+libgaim/gconf/gaim.schemas.in
libgaim/log.c
libgaim/plugin.c
libgaim/plugins/ciphertest.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nos...@us...> - 2006-09-29 20:22:52
|
Revision: 17398
http://svn.sourceforge.net/gaim/?rev=17398&view=rev
Author: nosnilmot
Date: 2006-09-29 13:22:46 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
Don't install config.h, no-one out-of-tree should be using our config.h
anyway. This resolves Fedora bug # 205206
Also make sure our public headers don't depend on it
Modified Paths:
--------------
trunk/Makefile.am
trunk/gtk/gtkpluginpref.h
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2006-09-29 13:04:01 UTC (rev 17397)
+++ trunk/Makefile.am 2006-09-29 20:22:46 UTC (rev 17398)
@@ -28,8 +28,7 @@
gtk/plugins/win32/winprefs/winprefs.c \
po/Makefile.mingw
-gaimincludedir=$(includedir)/gaim
-nodist_gaiminclude_HEADERS = config.h
+noinst_HEADERS = config.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gaim.pc
Modified: trunk/gtk/gtkpluginpref.h
===================================================================
--- trunk/gtk/gtkpluginpref.h 2006-09-29 13:04:01 UTC (rev 17397)
+++ trunk/gtk/gtkpluginpref.h 2006-09-29 20:22:46 UTC (rev 17398)
@@ -26,10 +26,6 @@
#ifndef _GAIM_GTKPLUGINPREF_H_
#define _GAIM_GTKPLUGINPREF_H_
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include "pluginpref.h"
#include "gtkgaim.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nos...@us...> - 2006-09-29 13:04:05
|
Revision: 17397
http://svn.sourceforge.net/gaim/?rev=17397&view=rev
Author: nosnilmot
Date: 2006-09-29 06:04:01 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
EXTRA_DIST should not be conditional on ENABLE_GTK
Modified Paths:
--------------
trunk/gtk/Makefile.am
Modified: trunk/gtk/Makefile.am
===================================================================
--- trunk/gtk/Makefile.am 2006-09-29 12:57:29 UTC (rev 17396)
+++ trunk/gtk/Makefile.am 2006-09-29 13:04:01 UTC (rev 17397)
@@ -1,5 +1,3 @@
-if ENABLE_GTK
-
EXTRA_DIST = \
getopt.c \
getopt.h \
@@ -54,6 +52,8 @@
win32/nsis/translations/trad-chinese.nsh \
win32/nsis/translations/vietnamese.nsh
+if ENABLE_GTK
+
SUBDIRS = pixmaps plugins sounds
bin_PROGRAMS = gaim
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nos...@us...> - 2006-09-29 12:57:45
|
Revision: 17396
http://svn.sourceforge.net/gaim/?rev=17396&view=rev
Author: nosnilmot
Date: 2006-09-29 05:57:29 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
Old automake prefers this way of conditionally building the bundled libgadu.
Modified Paths:
--------------
trunk/libgaim/protocols/gg/Makefile.am
Modified: trunk/libgaim/protocols/gg/Makefile.am
===================================================================
--- trunk/libgaim/protocols/gg/Makefile.am 2006-09-29 06:15:53 UTC (rev 17395)
+++ trunk/libgaim/protocols/gg/Makefile.am 2006-09-29 12:57:29 UTC (rev 17396)
@@ -15,20 +15,8 @@
pkgdir = $(libdir)/gaim
-GGSOURCES = \
- gg-utils.h \
- gg-utils.c \
- confer.h \
- confer.c \
- search.h \
- search.c \
- buddylist.h \
- buddylist.c \
- gg.h \
- gg.c
-
if USE_INTERNAL_LIBGADU
-GGSOURCES += \
+INTGGSOURCES = \
lib/common.c \
lib/compat.h \
lib/dcc.c \
@@ -44,6 +32,19 @@
INTGG_CFLAGS = -I$(top_srcdir)/libgaim/protocols/gg/lib
endif
+GGSOURCES = \
+ $(INTGGSOURCES) \
+ gg-utils.h \
+ gg-utils.c \
+ confer.h \
+ confer.c \
+ search.h \
+ search.c \
+ buddylist.h \
+ buddylist.c \
+ gg.h \
+ gg.c
+
AM_CFLAGS = $(st)
libgg_la_LDFLAGS = -module -avoid-version $(GLIB_LIBS)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-29 06:15:57
|
Revision: 17395
http://svn.sourceforge.net/gaim/?rev=17395&view=rev
Author: thekingant
Date: 2006-09-28 23:15:53 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
Use a GSList instead of a GQueue because g_queue_remove() wasn't added until
glib 2.4
Are we releasing beta 4 this weekend?
Modified Paths:
--------------
trunk/libgaim/dnsquery.c
Modified: trunk/libgaim/dnsquery.c
===================================================================
--- trunk/libgaim/dnsquery.c 2006-09-29 06:04:13 UTC (rev 17394)
+++ trunk/libgaim/dnsquery.c 2006-09-29 06:15:53 UTC (rev 17395)
@@ -67,7 +67,7 @@
};
static GSList *free_dns_children = NULL;
-static GQueue *queued_requests = NULL;
+static GSList *queued_requests = NULL;
static int number_of_dns_children = 0;
@@ -451,11 +451,12 @@
GaimDnsQueryData *query_data;
GaimDnsQueryResolverProcess *resolver;
- if ((queued_requests == NULL) || (g_queue_is_empty(queued_requests)))
+ if (queued_requests == NULL)
/* No more DNS queries, yay! */
return;
- query_data = g_queue_pop_head(queued_requests);
+ query_data = queued_requests->data;
+ queued_requests = g_slist_delete_link(queued_requests, queued_requests);
/*
* If we have any children, attempt to have them perform the DNS
@@ -479,7 +480,7 @@
if (number_of_dns_children >= MAX_DNS_CHILDREN)
{
/* Apparently all our children are busy */
- g_queue_push_head(queued_requests, query_data);
+ queued_requests = g_slist_prepend(queued_requests, query_data);
return;
}
@@ -597,9 +598,7 @@
g_return_val_if_reached(NULL);
}
- if (!queued_requests)
- queued_requests = g_queue_new();
- g_queue_push_tail(queued_requests, query_data);
+ queued_requests = g_slist_append(queued_requests, query_data);
gaim_debug_info("dns", "DNS query for '%s' queued\n", query_data->hostname);
@@ -851,7 +850,7 @@
gaim_dnsquery_destroy(GaimDnsQueryData *query_data)
{
#if defined(__unix__) || defined(__APPLE__)
- g_queue_remove(queued_requests, query_data);
+ queued_requests = g_slist_remove(queued_requests, query_data);
if (query_data->resolver != NULL)
/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-29 06:04:15
|
Revision: 17394
http://svn.sourceforge.net/gaim/?rev=17394&view=rev
Author: thekingant
Date: 2006-09-28 23:04:13 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
sf patch #1469293, from Ari Pollak
Our python script that generates dbus bindings was assuming that va_list
is a pointer, but it is not a pointer on all platforms (like alpha, for
example). I couldn't find a way to pass a va_list as a python
parameter, but I'm not very familiar with dbus.
This patch avoids creating a python binding for any function that accepts
a va_list.
Modified Paths:
--------------
trunk/libgaim/dbus-analyze-functions.py
Modified: trunk/libgaim/dbus-analyze-functions.py
===================================================================
--- trunk/libgaim/dbus-analyze-functions.py 2006-09-29 00:17:58 UTC (rev 17393)
+++ trunk/libgaim/dbus-analyze-functions.py 2006-09-29 06:04:13 UTC (rev 17394)
@@ -99,11 +99,6 @@
if (type[0] in simpletypes) or (type[0].startswith("Gaim")):
return self.inputsimple(type, name)
-
- # va_list, replace by NULL
- if type[0] == "va_list":
- return self.inputvalist(type, name)
-
# pointers ...
if (len(type) == 2) and (type[1] == pointer):
# strings
@@ -210,9 +205,6 @@
self.paramshdr.append("%s %s" % (type[0], name))
self.inputparams.append(("G_TYPE_INT", name))
- def inputvalist(self, type, name):
- self.paramshdr.append("va_list %s_NULL" % name)
-
def inputstring(self, type, name):
self.paramshdr.append("const char *%s" % name)
self.inputparams.append(("G_TYPE_STRING", name))
@@ -330,10 +322,6 @@
self.cparams.append(("INT32", name))
self.addintype("i", name)
- def inputvalist(self, type, name):
- self.cdecls.append("\tvoid * %s;" % name);
- self.ccode.append("\t%s = NULL;" % name);
-
def inputstring(self, type, name):
self.cdecls.append("\tconst char *%s;" % name)
self.cparams.append(("STRING", name))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-09-29 00:18:04
|
Revision: 17393
http://svn.sourceforge.net/gaim/?rev=17393&view=rev
Author: evands
Date: 2006-09-28 17:17:58 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
Hide the Browsers preference tab when running in OS X, as is done with gnome, and use its open command which functions as gnome-open does for handling clicked links.
Modified Paths:
--------------
trunk/gtk/gtknotify.c
trunk/gtk/gtkprefs.c
Modified: trunk/gtk/gtknotify.c
===================================================================
--- trunk/gtk/gtknotify.c 2006-09-29 00:17:18 UTC (rev 17392)
+++ trunk/gtk/gtknotify.c 2006-09-29 00:17:58 UTC (rev 17393)
@@ -942,6 +942,10 @@
{
command = g_strdup_printf("gnome-open %s", escaped);
}
+ else if (gaim_running_osx() == TRUE)
+ {
+ command = g_strdup_printf("open %s", escaped);
+ }
else if (!strcmp(web_browser, "epiphany") ||
!strcmp(web_browser, "galeon"))
{
Modified: trunk/gtk/gtkprefs.c
===================================================================
--- trunk/gtk/gtkprefs.c 2006-09-29 00:17:18 UTC (rev 17392)
+++ trunk/gtk/gtkprefs.c 2006-09-29 00:17:58 UTC (rev 17393)
@@ -1887,8 +1887,8 @@
prefs_notebook_add_page(_("Network"), NULL, network_page(), &p, NULL, notebook_page++);
#ifndef _WIN32
/* We use the registered default browser in windows */
- /* if the user is running gnome 2.x, hide the browsers tab */
- if (gaim_running_gnome() == FALSE) {
+ /* if the user is running gnome 2.x or Mac OS X, hide the browsers tab */
+ if ((gaim_running_gnome() == FALSE) && (gaim_running_osx() == FALSE)) {
prefs_notebook_add_page(_("Browser"), NULL, browser_page(), &p, NULL, notebook_page++);
}
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-09-29 00:17:25
|
Revision: 17392
http://svn.sourceforge.net/gaim/?rev=17392&view=rev
Author: evands
Date: 2006-09-28 17:17:18 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
Added gaim_running_osx() and fixed a typo.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/family_oservice.c
trunk/libgaim/util.c
trunk/libgaim/util.h
Modified: trunk/libgaim/protocols/oscar/family_oservice.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_oservice.c 2006-09-28 08:33:58 UTC (rev 17391)
+++ trunk/libgaim/protocols/oscar/family_oservice.c 2006-09-29 00:17:18 UTC (rev 17392)
@@ -215,7 +215,7 @@
* rate limiting properties (limit level, alert level, disconnect
* level, etc), and a set of SNAC family/type pairs associated with
* it. The rate classes, their limiting properties, and the definitions
- * of which SNACs are belong to which class, are defined in the
+ * of which SNACs belong to which class are defined in the
* Rate Response packet at login to each host.
*
* Logically, all rate offenses within one class count against further
Modified: trunk/libgaim/util.c
===================================================================
--- trunk/libgaim/util.c 2006-09-28 08:33:58 UTC (rev 17391)
+++ trunk/libgaim/util.c 2006-09-29 00:17:18 UTC (rev 17392)
@@ -2577,6 +2577,16 @@
#endif
}
+gboolean
+gaim_running_osx(void)
+{
+#if defined(__APPLE__)
+ return TRUE;
+#else
+ return FALSE;
+#endif
+}
+
char *
gaim_fd_get_ip(int fd)
{
Modified: trunk/libgaim/util.h
===================================================================
--- trunk/libgaim/util.h 2006-09-28 08:33:58 UTC (rev 17391)
+++ trunk/libgaim/util.h 2006-09-29 00:17:18 UTC (rev 17392)
@@ -584,6 +584,13 @@
gboolean gaim_running_kde(void);
/**
+ * Check if running OS X.
+ *
+ * @return TRUE if running OS X, FALSE otherwise.
+ */
+gboolean gaim_running_osx(void);
+
+/**
* Returns the IP address from a socket file descriptor.
*
* @param fd The socket file descriptor.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-28 08:34:06
|
Revision: 17391
http://svn.sourceforge.net/gaim/?rev=17391&view=rev
Author: thekingant
Date: 2006-09-28 01:33:58 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
G_MAXUINT32 is used in libgaim/protocols/oscar/oft.c, but it is only defined
in glib 2.4 and higher
Modified Paths:
--------------
trunk/libgaim/internal.h
Modified: trunk/libgaim/internal.h
===================================================================
--- trunk/libgaim/internal.h 2006-09-28 07:05:33 UTC (rev 17390)
+++ trunk/libgaim/internal.h 2006-09-28 08:33:58 UTC (rev 17391)
@@ -121,6 +121,10 @@
#define PATHSIZE 1024
#include <glib.h>
+#if !GLIB_CHECK_VERSION(2,4,0)
+# define G_MAXUINT32 ((guint32) 0xffffffff)
+#endif
+
#if GLIB_CHECK_VERSION(2,6,0)
# include <glib/gstdio.h>
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-28 07:05:38
|
Revision: 17390
http://svn.sourceforge.net/gaim/?rev=17390&view=rev
Author: thekingant
Date: 2006-09-28 00:05:33 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
This commit message isn't worth the Internet it's printed on
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-09-28 07:01:47 UTC (rev 17389)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-09-28 07:05:33 UTC (rev 17390)
@@ -1279,7 +1279,7 @@
case 0x01:
/* Unregistered screen name */
gc->wants_to_die = TRUE;
- gaim_connection_error(gc, _("Incorrect screen name."));
+ gaim_connection_error(gc, _("Invalid screen name."));
break;
case 0x05:
/* Incorrect nick/password */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-28 07:01:51
|
Revision: 17389
http://svn.sourceforge.net/gaim/?rev=17389&view=rev
Author: thekingant
Date: 2006-09-28 00:01:47 -0700 (Thu, 28 Sep 2006)
Log Message:
-----------
Fix sf bug #1469293
Checking if a va_list != NULL is not valid because va_list is not a pointer
on some platforms. Conveniently the check wasn't necessary.
Modified Paths:
--------------
trunk/libgaim/account.c
trunk/libgaim/account.h
trunk/libgaim/status.c
Modified: trunk/libgaim/account.c
===================================================================
--- trunk/libgaim/account.c 2006-09-28 06:32:53 UTC (rev 17388)
+++ trunk/libgaim/account.c 2006-09-28 07:01:47 UTC (rev 17389)
@@ -1369,32 +1369,21 @@
gaim_account_set_status(GaimAccount *account, const char *status_id,
gboolean active, ...)
{
- va_list args;
-
- va_start(args, active);
- gaim_account_set_status_vargs(account, status_id, active, args);
- va_end(args);
-}
-
-void
-gaim_account_set_status_vargs(GaimAccount *account, const char *status_id,
- gboolean active, va_list args)
-{
GList *attrs = NULL;
const gchar *id;
gpointer data;
+ va_list args;
- if (args != NULL)
+ va_start(args, active);
+ while ((id = va_arg(args, const char *)) != NULL)
{
- while ((id = va_arg(args, const char *)) != NULL)
- {
- attrs = g_list_append(attrs, (char *)id);
- data = va_arg(args, void *);
- attrs = g_list_append(attrs, data);
- }
+ attrs = g_list_append(attrs, (char *)id);
+ data = va_arg(args, void *);
+ attrs = g_list_append(attrs, data);
}
gaim_account_set_status_list(account, status_id, active, attrs);
g_list_free(attrs);
+ va_end(args);
}
void
Modified: trunk/libgaim/account.h
===================================================================
--- trunk/libgaim/account.h 2006-09-28 06:32:53 UTC (rev 17388)
+++ trunk/libgaim/account.h 2006-09-28 07:01:47 UTC (rev 17389)
@@ -287,8 +287,7 @@
/**
* Activates or deactivates a status. All changes to the statuses of
- * an account go through this function or gaim_account_set_status_vargs
- * or gaim_account_set_status_list.
+ * an account go through this function or gaim_account_set_status_list.
*
* Only independent statuses can be deactivated with this. To deactivate
* an exclusive status, activate a different (and exclusive?) status.
@@ -296,8 +295,8 @@
* @param account The account.
* @param status_id The ID of the status.
* @param active The active state.
- * @param ... Optional NULL-terminated attributes passed for the
- * new status, in an id, value pair.
+ * @param ... Pairs of attributes for the new status passed in
+ * as a NULL-terminated list of id/value pairs.
*/
void gaim_account_set_status(GaimAccount *account, const char *status_id,
gboolean active, ...);
@@ -305,8 +304,7 @@
/**
* Activates or deactivates a status. All changes to the statuses of
- * an account go through this function or gaim_account_set_status or
- * gaim_account_set_status_list.
+ * an account go through this function or gaim_account_set_status.
*
* Only independent statuses can be deactivated with this. To deactivate
* an exclusive status, activate a different (and exclusive?) status.
@@ -314,23 +312,6 @@
* @param account The account.
* @param status_id The ID of the status.
* @param active The active state.
- * @param args The va_list of attributes.
- */
-void gaim_account_set_status_vargs(GaimAccount *account,
- const char *status_id,
- gboolean active, va_list args);
-
-/**
- * Activates or deactivates a status. All changes to the statuses of
- * an account go through this function or gaim_account_set_status or
- * gaim_account_set_status_vargs.
- *
- * Only independent statuses can be deactivated with this. To deactivate
- * an exclusive status, activate a different (and exclusive?) status.
- *
- * @param account The account.
- * @param status_id The ID of the status.
- * @param active The active state.
* @param attrs A list of attributes in key/value pairs
*/
void gaim_account_set_status_list(GaimAccount *account,
Modified: trunk/libgaim/status.c
===================================================================
--- trunk/libgaim/status.c 2006-09-28 06:32:53 UTC (rev 17388)
+++ trunk/libgaim/status.c 2006-09-28 07:01:47 UTC (rev 17389)
@@ -718,14 +718,11 @@
const gchar *id;
gpointer data;
- if (args != NULL)
+ while ((id = va_arg(args, const char *)) != NULL)
{
- while ((id = va_arg(args, const char *)) != NULL)
- {
- attrs = g_list_append(attrs, (char *)id);
- data = va_arg(args, void *);
- attrs = g_list_append(attrs, data);
- }
+ attrs = g_list_append(attrs, (char *)id);
+ data = va_arg(args, void *);
+ attrs = g_list_append(attrs, data);
}
gaim_status_set_active_with_attrs_list(status, active, attrs);
g_list_free(attrs);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <the...@us...> - 2006-09-28 06:32:56
|
Revision: 17388
http://svn.sourceforge.net/gaim/?rev=17388&view=rev
Author: thekingant
Date: 2006-09-27 23:32:53 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
It looks like AOL now differentiates between "invalid screen name"
and "incorrect password" in their authentication failed error code.
Neat.
Modified Paths:
--------------
trunk/libgaim/protocols/oscar/oscar.c
Modified: trunk/libgaim/protocols/oscar/oscar.c
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.c 2006-09-28 04:02:21 UTC (rev 17387)
+++ trunk/libgaim/protocols/oscar/oscar.c 2006-09-28 06:32:53 UTC (rev 17388)
@@ -1276,10 +1276,15 @@
if (info->errorcode || !info->bosip || !info->cookielen || !info->cookie) {
char buf[256];
switch (info->errorcode) {
+ case 0x01:
+ /* Unregistered screen name */
+ gc->wants_to_die = TRUE;
+ gaim_connection_error(gc, _("Incorrect screen name."));
+ break;
case 0x05:
/* Incorrect nick/password */
gc->wants_to_die = TRUE;
- gaim_connection_error(gc, _("Incorrect nickname or password."));
+ gaim_connection_error(gc, _("Incorrect password."));
break;
case 0x11:
/* Suspended account */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lsc...@us...> - 2006-09-27 18:03:28
|
Revision: 17385
http://svn.sourceforge.net/gaim/?rev=17385&view=rev
Author: lschiere
Date: 2006-09-27 11:03:21 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
Patch from Eric Boumaour to fix missing files and extra files
Modified Paths:
--------------
trunk/po/POTFILES.in
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2006-09-27 17:28:44 UTC (rev 17384)
+++ trunk/po/POTFILES.in 2006-09-27 18:03:21 UTC (rev 17385)
@@ -145,14 +145,15 @@
libgaim/protocols/novell/novell.c
libgaim/protocols/oscar/flap_connection.c
libgaim/protocols/oscar/odc.c
+libgaim/protocols/oscar/oft.c
libgaim/protocols/oscar/oscar.c
libgaim/protocols/oscar/peer.c
libgaim/protocols/qq/buddy_info.c
libgaim/protocols/qq/buddy_list.c
libgaim/protocols/qq/buddy_opt.c
libgaim/protocols/qq/group.c
-libgaim/protocols/qq/group_hash.c
libgaim/protocols/qq/group_im.c
+libgaim/protocols/qq/group_internal.c
libgaim/protocols/qq/group_join.c
libgaim/protocols/qq/group_network.c
libgaim/protocols/qq/group_opt.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-09-27 04:44:34
|
Revision: 17383
http://svn.sourceforge.net/gaim/?rev=17383&view=rev
Author: evands
Date: 2006-09-26 21:44:30 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Fixed two issues which stem from changes when the Yahoo protocol upgrades were done; I'm fairly sure this properly fixes issue worked-around in [17080].
Yahoo buddies on the Ignore list were being added to the last group sent from the server. On Yahoo, an Ignored contact can never be on your contact list. These contacts should be noted locally as on the Deny list and, accordingly, not added to the contact list.
I added some comments about the keys and their order sent here based on my observations; they seem to generalize across a couple test cases I ran. See the comments themselves for details.
This fixes Adium Trac ticket #5470.
Modified Paths:
--------------
trunk/libgaim/protocols/yahoo/yahoo.c
Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c 2006-09-27 02:29:03 UTC (rev 17382)
+++ trunk/libgaim/protocols/yahoo/yahoo.c 2006-09-27 04:44:30 UTC (rev 17383)
@@ -491,29 +491,48 @@
l = l->next;
switch (pair->key) {
- case 302: /* what is this? it's always 318 before a group, 319 before a s/n */
- case 300: /* ditto */
+ case 302:
+ /* This is always 318 before a group, 319 before the first s/n in a group, 320 before any ignored s/n.
+ * It is not sent for s/n's in a group after the first.
+ * All ignored s/n's are listed last, so when we see a 320 we clear the group and begin marking the
+ * s/n's as ignored. It is always followed by an identical 300 key.
+ */
+ if (pair->value && !strcmp(pair->value, "320")) {
+ /* No longer in any group; this indicates the start of the ignore list. */
+ g_free(grp);
+ grp = NULL;
+ }
+
break;
+ case 301: /* This is 319 before all s/n's in a group after the first. It is followed by an identical 300. */
+ break;
+ case 300: /* This is 318 before a group, 319 before any s/n in a group, and 320 before any ignored s/n. */
+ break;
case 65: /* This is the group */
g_free(grp);
grp = yahoo_string_decode(gc, pair->value, FALSE);
break;
case 7: /* buddy's s/n */
- if (!grp) /* this buddy isn't in a group?! */
- break;
g_free(norm_bud);
norm_bud = g_strdup(gaim_normalize(account, pair->value));
- f = yahoo_friend_find_or_new(gc, norm_bud);
- if (!(b = gaim_find_buddy(account, norm_bud))) {
- if (!(g = gaim_find_group(grp))) {
- g = gaim_group_new(grp);
- gaim_blist_add_group(g, NULL);
+
+ if (grp) {
+ /* This buddy is in a group */
+ f = yahoo_friend_find_or_new(gc, norm_bud);
+ if (!(b = gaim_find_buddy(account, norm_bud))) {
+ if (!(g = gaim_find_group(grp))) {
+ g = gaim_group_new(grp);
+ gaim_blist_add_group(g, NULL);
+ }
+ b = gaim_buddy_new(account, norm_bud, NULL);
+ gaim_blist_add_buddy(b, NULL, g, NULL);
}
- b = gaim_buddy_new(account, norm_bud, NULL);
- gaim_blist_add_buddy(b, NULL, g, NULL);
+ yahoo_do_group_check(account, ht, norm_bud, grp);
+
+ } else {
+ /* This buddy is on the ignore list (and therefore in no group) */
+ gaim_privacy_deny_add(account, norm_bud, 1);
}
- yahoo_do_group_check(account, ht, norm_bud, grp);
-
break;
case 241: /* another protocol user */
if (f) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-27 02:29:38
|
Revision: 17382
http://svn.sourceforge.net/gaim/?rev=17382&view=rev
Author: sadrul
Date: 2006-09-26 19:29:03 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Update the statusbox when a plugin changes the global buddyicon.
Make sure the iconboxes show up correctly if a plugin toggles them on/off.
Modified Paths:
--------------
trunk/gtk/gtkstatusbox.c
Modified: trunk/gtk/gtkstatusbox.c
===================================================================
--- trunk/gtk/gtkstatusbox.c 2006-09-27 02:07:06 UTC (rev 17381)
+++ trunk/gtk/gtkstatusbox.c 2006-09-27 02:29:03 UTC (rev 17382)
@@ -298,6 +298,8 @@
if (status_box->icon_box != NULL)
return;
+ status_box->icon = gtk_image_new();
+ status_box->icon_box = gtk_event_box_new();
if (status_box->account &&
!gaim_account_get_ui_bool(status_box->account, GAIM_GTK_UI, "use-global-buddyicon", TRUE))
{
@@ -309,8 +311,6 @@
{
gtk_gaim_status_box_set_buddy_icon(status_box, gaim_prefs_get_string("/gaim/gtk/accounts/buddyicon"));
}
- status_box->icon = gtk_image_new();
- status_box->icon_box = gtk_event_box_new();
status_box->hand_cursor = gdk_cursor_new (GDK_HAND2);
status_box->arrow_cursor = gdk_cursor_new (GDK_LEFT_PTR);
@@ -352,6 +352,7 @@
g_free(statusbox->buddy_icon_path);
+ statusbox->icon = NULL;
statusbox->icon_box = NULL;
statusbox->buddy_icon_path = NULL;
statusbox->buddy_icon = NULL;
@@ -1087,7 +1088,7 @@
}
static void
-icon_choose_cb(const char *filename, gpointer data)
+buddy_icon_set_cb(const char *filename, gpointer data)
{
GtkGaimStatusBox *box;
@@ -1125,14 +1126,30 @@
}
}
gtk_gaim_status_box_set_buddy_icon(box, filename);
- if (box->account == NULL)
- gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", filename);
}
box->buddy_icon_sel = NULL;
}
static void
+icon_choose_cb(const char *filename, gpointer data)
+{
+ GtkGaimStatusBox *box = data;
+ if (box->account == NULL)
+ /* The pref-connect callback does the actual work */
+ gaim_prefs_set_string("/gaim/gtk/accounts/buddyicon", filename);
+ else
+ buddy_icon_set_cb(filename, data);
+}
+
+static void
+update_buddyicon_cb(const char *name, GaimPrefType type,
+ gconstpointer value, gpointer data)
+{
+ buddy_icon_set_cb(value, data);
+}
+
+static void
gtk_gaim_status_box_init (GtkGaimStatusBox *status_box)
{
GtkCellRenderer *text_rend;
@@ -1234,6 +1251,8 @@
buddy_list_details_pref_changed_cb, status_box);
gaim_prefs_connect_callback(status_box, "/gaim/gtk/conversations/spellcheck",
spellcheck_prefs_cb, status_box);
+ gaim_prefs_connect_callback(status_box, "/gaim/gtk/accounts/buddyicon",
+ update_buddyicon_cb, status_box);
}
static void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-27 02:07:10
|
Revision: 17381
http://svn.sourceforge.net/gaim/?rev=17381&view=rev
Author: datallah
Date: 2006-09-26 19:07:06 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Fix some signedness warnings
Modified Paths:
--------------
trunk/libgaim/protocols/jabber/jabber.c
trunk/libgaim/protocols/jabber/oob.c
Modified: trunk/libgaim/protocols/jabber/jabber.c
===================================================================
--- trunk/libgaim/protocols/jabber/jabber.c 2006-09-27 02:01:29 UTC (rev 17380)
+++ trunk/libgaim/protocols/jabber/jabber.c 2006-09-27 02:07:06 UTC (rev 17381)
@@ -402,10 +402,10 @@
#ifdef HAVE_CYRUS_SASL
if (js->sasl_maxbuf>0) {
const char *out;
- int olen;
+ unsigned int olen;
sasl_decode(js->sasl, buf, len, &out, &olen);
if (olen>0) {
- gaim_debug(GAIM_DEBUG_INFO, "jabber", "RecvSASL (%d): %s\n", olen, out);
+ gaim_debug(GAIM_DEBUG_INFO, "jabber", "RecvSASL (%u): %s\n", olen, out);
jabber_parser_process(js,out,olen);
}
return;
Modified: trunk/libgaim/protocols/jabber/oob.c
===================================================================
--- trunk/libgaim/protocols/jabber/oob.c 2006-09-27 02:01:29 UTC (rev 17380)
+++ trunk/libgaim/protocols/jabber/oob.c 2006-09-27 02:07:06 UTC (rev 17381)
@@ -143,7 +143,7 @@
tmp += 4;
- *buffer = g_strdup(tmp);
+ *buffer = (unsigned char*) g_strdup(tmp);
return strlen(tmp);
}
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dat...@us...> - 2006-09-27 02:01:32
|
Revision: 17380
http://svn.sourceforge.net/gaim/?rev=17380&view=rev
Author: datallah
Date: 2006-09-26 19:01:29 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Fix the send_raw method signature (even though it still doesn't really functionally match what the core wants)
Modified Paths:
--------------
trunk/libgaim/protocols/simple/simple.c
Modified: trunk/libgaim/protocols/simple/simple.c
===================================================================
--- trunk/libgaim/protocols/simple/simple.c 2006-09-27 01:16:38 UTC (rev 17379)
+++ trunk/libgaim/protocols/simple/simple.c 2006-09-27 02:01:29 UTC (rev 17380)
@@ -521,7 +521,7 @@
}
}
-static void simple_send_raw(GaimConnection *gc, const char *buf, int len)
+static int simple_send_raw(GaimConnection *gc, const char *buf, int len)
{
sendout_pkt(gc, buf);
return len;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-09-27 01:16:41
|
Revision: 17379
http://svn.sourceforge.net/gaim/?rev=17379&view=rev
Author: seanegan
Date: 2006-09-26 18:16:38 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Brad Potts points out this incosistent capitalization
Modified Paths:
--------------
trunk/gtk/gtkimhtmltoolbar.c
Modified: trunk/gtk/gtkimhtmltoolbar.c
===================================================================
--- trunk/gtk/gtkimhtmltoolbar.c 2006-09-27 00:31:39 UTC (rev 17378)
+++ trunk/gtk/gtkimhtmltoolbar.c 2006-09-27 01:16:38 UTC (rev 17379)
@@ -986,7 +986,7 @@
gtk_size_group_add_widget(sg, button);
gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
gtk_tooltips_set_tip(toolbar->tooltips, button,
- _("Font Face"), NULL);
+ _("Font face"), NULL);
g_signal_connect(G_OBJECT(button), "clicked",
G_CALLBACK(toggle_font), toolbar);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2006-09-27 00:31:42
|
Revision: 17378
http://svn.sourceforge.net/gaim/?rev=17378&view=rev
Author: markhuetsch
Date: 2006-09-26 17:31:39 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
There's no reason to generate our session_md5 more than once. This probably doesn't fix the bug from Adium crash 215722, but if it happens again, it'll be a bit easier to track down.
Also, I was wrong about the login scheme. Nothing significant is different, so remove the comment.
Modified Paths:
--------------
trunk/libgaim/protocols/qq/file_trans.c
trunk/libgaim/protocols/qq/im.c
trunk/libgaim/protocols/qq/login_logout.c
trunk/libgaim/protocols/qq/qq.h
trunk/libgaim/protocols/qq/qq_proxy.c
trunk/libgaim/protocols/qq/send_file.c
Modified: trunk/libgaim/protocols/qq/file_trans.c
===================================================================
--- trunk/libgaim/protocols/qq/file_trans.c 2006-09-26 23:20:39 UTC (rev 17377)
+++ trunk/libgaim/protocols/qq/file_trans.c 2006-09-27 00:31:39 UTC (rev 17378)
@@ -284,7 +284,7 @@
{
qq_data *qd;
gint bytes, bytes_expected, encrypted_len;
- guint8 *raw_data, *cursor, *encrypted_data, *md5;
+ guint8 *raw_data, *cursor, *encrypted_data;
time_t now;
ft_info *info;
@@ -296,9 +296,8 @@
bytes = 0;
now = time(NULL);
- md5 = _gen_session_md5(qd->uid, qd->session_key);
- bytes += create_packet_data(raw_data, &cursor, md5, 16);
+ bytes += create_packet_data(raw_data, &cursor, qd->session_md5, 16);
bytes += create_packet_w(raw_data, &cursor, packet_type);
switch (packet_type) {
case QQ_FILE_CMD_SENDER_SAY_HELLO:
@@ -377,8 +376,6 @@
else
gaim_debug(GAIM_DEBUG_ERROR, "QQ", "qq_send_file_ctl_packet: Expected to get %d bytes, but get %d",
bytes_expected, bytes);
-
- g_free(md5);
}
/* send a file to udp channel with QQ_FILE_DATA_PACKET_TAG */
@@ -521,14 +518,12 @@
guint16 packet_type;
guint16 seq;
guint8 hellobyte;
- guint8 *md5;
ft_info *info = (ft_info *) qd->xfer->data;
decrypted_data = g_newa(guint8, len);
decrypted_len = len;
- md5 = _gen_session_md5(qd->uid, qd->session_key);
- if (qq_crypt(DECRYPT, cursor, len - (cursor - data), md5, decrypted_data, &decrypted_len)) {
+ if (qq_crypt(DECRYPT, cursor, len - (cursor - data), qd->session_md5, decrypted_data, &decrypted_len)) {
cursor = decrypted_data + 16; /* skip md5 section */
read_packet_w(decrypted_data, &cursor, decrypted_len, &packet_type);
read_packet_w(decrypted_data, &cursor, decrypted_len, &seq);
@@ -577,7 +572,6 @@
gaim_debug(GAIM_DEBUG_INFO, "QQ", "unprocess file command %d\n", packet_type);
}
}
- g_free(md5);
}
static void _qq_recv_file_progess(GaimConnection *gc, guint8 *buffer, guint16 len, guint32 index, guint32 offset)
Modified: trunk/libgaim/protocols/qq/im.c
===================================================================
--- trunk/libgaim/protocols/qq/im.c 2006-09-26 23:20:39 UTC (rev 17377)
+++ trunk/libgaim/protocols/qq/im.c 2006-09-27 00:31:39 UTC (rev 17378)
@@ -425,7 +425,7 @@
void qq_send_packet_im(GaimConnection *gc, guint32 to_uid, gchar *msg, gint type)
{
qq_data *qd;
- guint8 *cursor, *raw_data, *send_im_tail, *md5;
+ guint8 *cursor, *raw_data, *send_im_tail;
guint16 client_tag, normal_im_type;
gint msg_len, raw_len, font_name_len, tail_len, bytes;
time_t now;
@@ -483,7 +483,6 @@
msg_filtered = gaim_markup_strip_html(msg);
msg_len = strlen(msg_filtered);
now = time(NULL);
- md5 = _gen_session_md5(qd->uid, qd->session_key);
font_name_len = (font_name) ? strlen(font_name) : DEFAULT_FONT_NAME_LEN;
tail_len = font_name_len + QQ_SEND_IM_AFTER_MSG_HEADER_LEN + 1;
@@ -504,7 +503,7 @@
/* 014-017: sender uid */
bytes += create_packet_dw(raw_data, &cursor, to_uid);
/* 018-033: md5 of (uid+session_key) */
- bytes += create_packet_data(raw_data, &cursor, md5, 16);
+ bytes += create_packet_data(raw_data, &cursor, qd->session_md5, 16);
/* 034-035: message type */
bytes += create_packet_w(raw_data, &cursor, normal_im_type);
/* 036-037: sequence number */
Modified: trunk/libgaim/protocols/qq/login_logout.c
===================================================================
--- trunk/libgaim/protocols/qq/login_logout.c 2006-09-26 23:20:39 UTC (rev 17377)
+++ trunk/libgaim/protocols/qq/login_logout.c 2006-09-27 00:31:39 UTC (rev 17378)
@@ -171,23 +171,23 @@
/* 017-020: login uid */
bytes += read_packet_dw(data, &cursor, len, &lrop.uid);
/* 021-024: server detected user public IP */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.client_ip, 4);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.client_ip, 4);
/* 025-026: server detected user port */
bytes += read_packet_w(data, &cursor, len, &lrop.client_port);
/* 027-030: server detected itself ip 127.0.0.1 ? */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.server_ip, 4);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.server_ip, 4);
/* 031-032: server listening port */
bytes += read_packet_w(data, &cursor, len, &lrop.server_port);
/* 033-036: login time for current session */
- bytes += read_packet_dw(data, &cursor, len, (guint32 *) & lrop.login_time);
+ bytes += read_packet_dw(data, &cursor, len, (guint32 *) &lrop.login_time);
/* 037-062: 26 bytes, unknown */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.unknown1, 26);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.unknown1, 26);
/* 063-066: unknown server1 ip address */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.unknown_server1_ip, 4);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.unknown_server1_ip, 4);
/* 067-068: unknown server1 port */
bytes += read_packet_w(data, &cursor, len, &lrop.unknown_server1_port);
/* 069-072: unknown server2 ip address */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.unknown_server2_ip, 4);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.unknown_server2_ip, 4);
/* 073-074: unknown server2 port */
bytes += read_packet_w(data, &cursor, len, &lrop.unknown_server2_port);
/* 075-076: 2 bytes unknown */
@@ -195,15 +195,15 @@
/* 077-078: 2 bytes unknown */
bytes += read_packet_w(data, &cursor, len, &lrop.unknown3);
/* 079-110: 32 bytes unknown */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.unknown4, 32);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.unknown4, 32);
/* 111-122: 12 bytes unknown */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.unknown5, 12);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.unknown5, 12);
/* 123-126: login IP of last session */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.last_client_ip, 4);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.last_client_ip, 4);
/* 127-130: login time of last session */
- bytes += read_packet_dw(data, &cursor, len, (guint32 *) & lrop.last_login_time);
+ bytes += read_packet_dw(data, &cursor, len, (guint32 *) &lrop.last_login_time);
/* 131-138: 8 bytes unknown */
- bytes += read_packet_data(data, &cursor, len, (guint8 *) & lrop.unknown6, 8);
+ bytes += read_packet_data(data, &cursor, len, (guint8 *) &lrop.unknown6, 8);
if (bytes != QQ_LOGIN_REPLY_OK_PACKET_LEN) { /* fail parsing login info */
gaim_debug(GAIM_DEBUG_WARNING, "QQ",
@@ -211,15 +211,14 @@
QQ_LOGIN_REPLY_OK_PACKET_LEN, bytes);
} /* but we still go on as login OK */
- qd->session_key = g_memdup(lrop.session_key, QQ_KEY_LENGTH);
+ qd->session_key = lrop.session_key;
+ qd->session_md5 = _gen_session_md5(qd->uid, qd->session_key);
qd->my_ip = gen_ip_str(lrop.client_ip);
qd->my_port = lrop.client_port;
qd->login_time = lrop.login_time;
qd->last_login_time = lrop.last_login_time;
qd->last_login_ip = gen_ip_str(lrop.last_client_ip);
- g_free(lrop.session_key);
-
gaim_connection_set_state(gc, GAIM_CONNECTED);
qd->logged_in = TRUE; /* must be defined after sev_finish_login */
@@ -279,7 +278,7 @@
}
/* process login reply which says wrong password */
-static gint _qq_process_login_wrong_pwd(GaimConnection * gc, guint8 * data, gint len)
+static gint _qq_process_login_wrong_pwd(GaimConnection *gc, guint8 *data, gint len)
{
gchar *server_reply, *server_reply_utf8;
server_reply = g_new0(gchar, len);
@@ -316,10 +315,6 @@
gaim_debug(GAIM_DEBUG_ERROR, "QQ", "Fail create request login token packet\n");
}
-/* TODO: The login packet and its response have changed by QQ2006 Beta2. In that version,
- * the login OK response packet does not appear to be decryptable with qd->pwkey or qd->inikey.
- * Fortunately, this older system still works. */
-
/* send login packet to QQ server */
static void qq_send_packet_login(GaimConnection *gc, guint8 token_length, guint8 *token)
{
Modified: trunk/libgaim/protocols/qq/qq.h
===================================================================
--- trunk/libgaim/protocols/qq/qq.h 2006-09-26 23:20:39 UTC (rev 17377)
+++ trunk/libgaim/protocols/qq/qq.h 2006-09-27 00:31:39 UTC (rev 17378)
@@ -61,6 +61,7 @@
guint8 *inikey; /* initial key to encrypt login packet */
guint8 *pwkey; /* password in md5 (or md5' md5) */
guint8 *session_key; /* later use this as key in this session */
+ guint8 *session_md5; /* concatenate my uid with session_key and md5 it */
guint16 send_seq; /* send sequence number */
guint8 login_mode; /* online of invisible */
Modified: trunk/libgaim/protocols/qq/qq_proxy.c
===================================================================
--- trunk/libgaim/protocols/qq/qq_proxy.c 2006-09-26 23:20:39 UTC (rev 17377)
+++ trunk/libgaim/protocols/qq/qq_proxy.c 2006-09-27 00:31:39 UTC (rev 17378)
@@ -457,6 +457,7 @@
g_free(qd->inikey);
g_free(qd->pwkey);
g_free(qd->session_key);
+ g_free(qd->session_md5);
g_free(qd->my_ip);
g_free(qd);
Modified: trunk/libgaim/protocols/qq/send_file.c
===================================================================
--- trunk/libgaim/protocols/qq/send_file.c 2006-09-26 23:20:39 UTC (rev 17377)
+++ trunk/libgaim/protocols/qq/send_file.c 2006-09-27 00:31:39 UTC (rev 17378)
@@ -281,13 +281,11 @@
{
gint bytes;
time_t now;
- guint8 *md5;
guint16 seq;
ft_info *info;
bytes = 0;
now = time(NULL);
- md5 = _gen_session_md5(qd->uid, qd->session_key);
if (!seq_ack) seq = qd->send_seq;
else {
info = (ft_info *) qd->xfer->data;
@@ -305,7 +303,7 @@
/* 014-017: sender uid */
bytes += create_packet_dw (raw_data, cursor, to_uid);
/* 018-033: md5 of (uid+session_key) */
- bytes += create_packet_data (raw_data, cursor, md5, 16);
+ bytes += create_packet_data (raw_data, cursor, qd->session_md5, 16);
/* 034-035: message type */
bytes += create_packet_w (raw_data, cursor, message_type);
/* 036-037: sequence number */
@@ -332,7 +330,6 @@
/* 063: transfer_type, 0x65: FILE 0x6b: FACE */
bytes += create_packet_b (raw_data, cursor, QQ_FILE_TRANSFER_FILE); /* FIXME */
- g_free (md5);
return bytes;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ev...@us...> - 2006-09-26 23:20:44
|
Revision: 17377
http://svn.sourceforge.net/gaim/?rev=17377&view=rev
Author: evands
Date: 2006-09-26 16:20:39 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
A pending yahoo_buddy_icon_upload() request is now cancelled when disconnecting or if a second upload request is made, which can happen if the user rapidly changes buddy icons.
Modified Paths:
--------------
trunk/libgaim/protocols/yahoo/yahoo.c
trunk/libgaim/protocols/yahoo/yahoo.h
trunk/libgaim/protocols/yahoo/yahoo_picture.c
Modified: trunk/libgaim/protocols/yahoo/yahoo.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.c 2006-09-26 23:02:40 UTC (rev 17376)
+++ trunk/libgaim/protocols/yahoo/yahoo.c 2006-09-26 23:20:39 UTC (rev 17377)
@@ -2778,6 +2778,8 @@
yd->rxlen = 0;
g_free(yd->picture_url);
+ if (yd->buddy_icon_connect_data)
+ gaim_proxy_connect_cancel(yd->buddy_icon_connect_data);
if (yd->picture_upload_todo)
yahoo_buddy_icon_upload_data_free(yd->picture_upload_todo);
if (yd->ycht)
Modified: trunk/libgaim/protocols/yahoo/yahoo.h
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo.h 2006-09-26 23:02:40 UTC (rev 17376)
+++ trunk/libgaim/protocols/yahoo/yahoo.h 2006-09-26 23:20:39 UTC (rev 17377)
@@ -137,6 +137,7 @@
/* ew. we have to check the icon before we connect,
* but can't upload it til we're connected. */
struct yahoo_buddy_icon_upload_data *picture_upload_todo;
+ GaimProxyConnectData *buddy_icon_connect_data;
struct _YchtConn *ycht;
Modified: trunk/libgaim/protocols/yahoo/yahoo_picture.c
===================================================================
--- trunk/libgaim/protocols/yahoo/yahoo_picture.c 2006-09-26 23:02:40 UTC (rev 17376)
+++ trunk/libgaim/protocols/yahoo/yahoo_picture.c 2006-09-26 23:20:39 UTC (rev 17377)
@@ -444,13 +444,15 @@
account = gaim_connection_get_account(gc);
yd = gc->proto_data;
+ /* Buddy icon connect is now complete; clear the GaimProxyConnectData */
+ yd->buddy_icon_connect_data = NULL;
+
if (source < 0) {
gaim_debug_error("yahoo", "Buddy icon upload failed, no file desc.\n");
yahoo_buddy_icon_upload_data_free(d);
return;
}
-
pkt = yahoo_packet_new(0xc2, YAHOO_STATUS_AVAILABLE, yd->session_id);
size = g_strdup_printf("%" G_GSIZE_FORMAT, d->str->len);
@@ -498,26 +500,37 @@
{
GaimAccount *account = gaim_connection_get_account(gc);
struct yahoo_data *yd = gc->proto_data;
+ GaimProxyConnectData *connect_data = NULL;
g_return_if_fail(d != NULL);
+ if (yd->buddy_icon_connect_data) {
+ /* Cancel any in-progress buddy icon upload */
+ gaim_proxy_connect_cancel(yd->buddy_icon_connect_data);
+ yd->buddy_icon_connect_data = NULL;
+ }
+
if (yd->jp) {
- if (gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
- gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
- yahoo_buddy_icon_upload_connected, d) == NULL)
+ if ((connect_data = gaim_proxy_connect(account, gaim_account_get_string(account, "xferjp_host", YAHOOJP_XFER_HOST),
+ gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
+ yahoo_buddy_icon_upload_connected, d)) == NULL)
{
gaim_debug_error("yahoo", "Uploading our buddy icon failed to connect.\n");
yahoo_buddy_icon_upload_data_free(d);
}
} else {
- if (gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
- gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
- yahoo_buddy_icon_upload_connected, d) == NULL)
+ if ((connect_data = gaim_proxy_connect(account, gaim_account_get_string(account, "xfer_host", YAHOO_XFER_HOST),
+ gaim_account_get_int(account, "xfer_port", YAHOO_XFER_PORT),
+ yahoo_buddy_icon_upload_connected, d)) == NULL)
{
gaim_debug_error("yahoo", "Uploading our buddy icon failed to connect.\n");
yahoo_buddy_icon_upload_data_free(d);
}
}
+
+ if (connect_data) {
+ yd->buddy_icon_connect_data = connect_data;
+ }
}
void yahoo_set_buddy_icon(GaimConnection *gc, const char *iconfile)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sa...@us...> - 2006-09-26 23:02:44
|
Revision: 17376
http://svn.sourceforge.net/gaim/?rev=17376&view=rev
Author: sadrul
Date: 2006-09-26 16:02:40 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Patch from Richard Nelson (wabz) to fix a crash. This is probably what Luke is getting.
I had it fixed in my local tree, not sure why I hadn't committed.
Modified Paths:
--------------
trunk/console/gntblist.c
Modified: trunk/console/gntblist.c
===================================================================
--- trunk/console/gntblist.c 2006-09-26 22:54:24 UTC (rev 17375)
+++ trunk/console/gntblist.c 2006-09-26 23:02:40 UTC (rev 17376)
@@ -1647,7 +1647,7 @@
GaimConnection *gc = gaim_account_get_connection(account);
GaimPlugin *prpl;
- if (!GAIM_CONNECTION_IS_CONNECTED(gc))
+ if (!gc || !GAIM_CONNECTION_IS_CONNECTED(gc))
continue;
prpl = gc->prpl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2006-09-26 22:54:31
|
Revision: 17375
http://svn.sourceforge.net/gaim/?rev=17375&view=rev
Author: markhuetsch
Date: 2006-09-26 15:54:24 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Get rid of these useless checks.
Modified Paths:
--------------
trunk/libgaim/protocols/qq/buddy_info.c
trunk/libgaim/protocols/qq/buddy_list.c
trunk/libgaim/protocols/qq/buddy_opt.c
trunk/libgaim/protocols/qq/buddy_status.c
trunk/libgaim/protocols/qq/file_trans.c
trunk/libgaim/protocols/qq/group.c
trunk/libgaim/protocols/qq/group_conv.c
trunk/libgaim/protocols/qq/group_find.c
trunk/libgaim/protocols/qq/group_im.c
trunk/libgaim/protocols/qq/group_info.c
trunk/libgaim/protocols/qq/group_internal.c
trunk/libgaim/protocols/qq/group_join.c
trunk/libgaim/protocols/qq/group_network.c
trunk/libgaim/protocols/qq/group_opt.c
trunk/libgaim/protocols/qq/group_search.c
trunk/libgaim/protocols/qq/im.c
trunk/libgaim/protocols/qq/keep_alive.c
trunk/libgaim/protocols/qq/login_logout.c
trunk/libgaim/protocols/qq/qq.c
trunk/libgaim/protocols/qq/recv_core.c
trunk/libgaim/protocols/qq/send_core.c
trunk/libgaim/protocols/qq/send_file.c
trunk/libgaim/protocols/qq/sendqueue.c
trunk/libgaim/protocols/qq/sys_msg.c
Modified: trunk/libgaim/protocols/qq/buddy_info.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_info.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/buddy_info.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -235,7 +235,7 @@
gchar uid_str[11];
qq_info_query *query;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && uid != 0);
+ g_return_if_fail(uid != 0);
qd = (qq_data *) gc->proto_data;
g_snprintf(uid_str, sizeof(uid_str), "%d", uid);
@@ -272,7 +272,7 @@
gint i;
guint8 *raw_data, *cursor, bar;
- g_return_if_fail(gc != NULL && segments != NULL);
+ g_return_if_fail(segments != NULL);
bar = 0x1f;
raw_data = g_newa(guint8, MAX_PACKET_SIZE - 128);
@@ -489,7 +489,6 @@
gint len;
guint8 *data;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -515,7 +514,6 @@
qq_buddy *q_bud;
gchar *alias_utf8;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
alias_utf8 = qq_to_utf8(info->nick, QQ_CHARSET_DEFAULT);
@@ -550,7 +548,6 @@
GList *list, *query_list;
GString *info_text;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
Modified: trunk/libgaim/protocols/qq/buddy_list.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_list.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/buddy_list.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -62,8 +62,6 @@
qq_data *qd;
guint8 *raw_data, *cursor;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
raw_data = g_newa(guint8, 5);
cursor = raw_data;
@@ -91,8 +89,6 @@
guint8 *raw_data, *cursor;
gint data_len;
- g_return_if_fail(gc != NULL);
-
data_len = 3;
raw_data = g_newa(guint8, data_len);
cursor = raw_data;
@@ -114,8 +110,6 @@
guint8 *raw_data, *cursor;
gint data_len;
- g_return_if_fail(gc != NULL);
-
data_len = 10;
raw_data = g_newa(guint8, data_len);
cursor = raw_data;
@@ -159,7 +153,6 @@
qq_buddy *q_bud;
qq_friends_online_entry *fe;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -259,7 +252,6 @@
gchar *name;
GaimBuddy *b;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -354,7 +346,6 @@
guint8 type, groupid;
qq_group *group;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
Modified: trunk/libgaim/protocols/qq/buddy_opt.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_opt.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/buddy_opt.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -61,7 +61,7 @@
{
gchar uid_str[11];
- g_return_if_fail(gc != NULL && uid > 0);
+ g_return_if_fail(uid > 0);
g_snprintf(uid_str, sizeof(uid_str), "%d", uid);
qq_send_cmd(gc, QQ_CMD_DEL_FRIEND, TRUE, 0,
@@ -73,7 +73,7 @@
{
guint8 *raw_data, *cursor;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && uid > 0);
+ g_return_if_fail(uid > 0);
raw_data = g_newa(guint8, 4);
cursor = raw_data;
@@ -89,7 +89,7 @@
qq_add_buddy_request *req;
gchar uid_str[11];
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && uid > 0);
+ g_return_if_fail(uid > 0);
/* we need to send the ascii code of this uid to qq server */
g_snprintf(uid_str, sizeof(uid_str), "%d", uid);
@@ -110,7 +110,7 @@
gchar *text_qq, uid_str[11];
guint8 bar, *cursor, *raw_data;
- g_return_if_fail(gc != NULL && uid != 0);
+ g_return_if_fail(uid != 0);
g_snprintf(uid_str, sizeof(uid_str), "%d", uid);
bar = 0x1f;
@@ -139,7 +139,7 @@
gc = g->gc;
uid = g->uid;
- g_return_if_fail(gc != NULL && uid != 0);
+ g_return_if_fail(uid != 0);
_qq_send_packet_buddy_auth(gc, uid, QQ_MY_AUTH_REQUEST, text);
g_free(g);
@@ -155,7 +155,7 @@
gc = g->gc;
uid = g->uid;
- g_return_if_fail(gc != NULL && uid != 0);
+ g_return_if_fail(uid != 0);
_qq_send_packet_buddy_auth(gc, uid, QQ_MY_AUTH_REJECT, reason);
g_free(g);
@@ -171,7 +171,7 @@
gc = g->gc;
uid = g->uid;
- g_return_if_fail(gc != NULL && uid != 0);
+ g_return_if_fail(uid != 0);
_qq_send_packet_buddy_auth(gc, uid, QQ_MY_AUTH_APPROVE, NULL);
g_free(g);
@@ -194,7 +194,7 @@
gc = g->gc;
uid = g->uid;
- g_return_if_fail(gc != NULL && uid != 0);
+ g_return_if_fail(uid != 0);
g_free(g);
@@ -219,7 +219,7 @@
gc = g->gc;
uid = g->uid;
- g_return_if_fail(gc != NULL && uid != 0);
+ g_return_if_fail(uid != 0);
_qq_send_packet_add_buddy(gc, uid);
g_free(g);
@@ -236,7 +236,7 @@
gc = g->gc;
uid = g->uid;
- g_return_if_fail(gc != NULL && uid > 0);
+ g_return_if_fail(uid > 0);
buddy.name = uid_to_gaim_name(uid);
group.name = GAIM_GROUP_QQ_BLOCKED;
@@ -253,7 +253,6 @@
guint8 *data, *cursor, reply;
gchar **segments, *msg_utf8;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -285,7 +284,6 @@
gint len;
guint8 *data, *cursor, reply;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -314,7 +312,6 @@
gint len;
guint8 *data, *cursor, reply;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -347,7 +344,6 @@
gc_and_uid *g;
qq_add_buddy_request *req;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
for_uid = 0;
@@ -442,8 +438,6 @@
qq_buddy *q_bud;
gchar *name, *group_name;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
-
a = gc->account;
qd = (qq_data *) gc->proto_data;
g_return_val_if_fail(a != NULL && uid != 0, NULL);
@@ -492,8 +486,6 @@
guint32 uid;
GaimBuddy *b;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
if (!qd->logged_in)
return; /* IMPORTANT ! */
@@ -519,8 +511,6 @@
qq_buddy *q_bud;
guint32 uid;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
uid = gaim_name_to_uid(buddy->name);
@@ -551,8 +541,6 @@
gint i;
qq_add_buddy_request *p;
- g_return_if_fail(qd != NULL);
-
i = 0;
while (qd->add_buddy_request) {
p = (qq_add_buddy_request *) (qd->add_buddy_request->data);
@@ -571,8 +559,6 @@
gchar *name;
GaimBuddy *b;
- g_return_if_fail(qd != NULL);
-
i = 0;
while (qd->buddies) {
p = (qq_buddy *) (qd->buddies->data);
Modified: trunk/libgaim/protocols/qq/buddy_status.c
===================================================================
--- trunk/libgaim/protocols/qq/buddy_status.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/buddy_status.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -118,8 +118,6 @@
GaimAccount *account;
GaimPresence *presence;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, 2);
-
account = gaim_connection_get_account(gc);
presence = gaim_account_get_presence(account);
@@ -144,8 +142,6 @@
GaimAccount *account;
GaimPresence *presence;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
account = gaim_connection_get_account(gc);
presence = gaim_account_get_presence(account);
@@ -189,7 +185,6 @@
qq_buddy *q_bud;
gchar *name;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -226,7 +221,6 @@
qq_buddy_status *s;
gchar *name;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
Modified: trunk/libgaim/protocols/qq/file_trans.c
===================================================================
--- trunk/libgaim/protocols/qq/file_trans.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/file_trans.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -256,9 +256,8 @@
qq_data *qd;
ft_info *info;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
qd = (qq_data *) gc->proto_data;
- g_return_val_if_fail(qd != NULL && qd->session_key != NULL, -1);
+ g_return_val_if_fail(qd->session_key != NULL, -1);
info = (ft_info *) qd->xfer->data;
bytes = 0;
@@ -289,7 +288,6 @@
time_t now;
ft_info *info;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
info = (ft_info *) qd->xfer->data;
@@ -395,7 +393,6 @@
qq_data *qd;
ft_info *info;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
info = (ft_info *) qd->xfer->data;
@@ -820,7 +817,6 @@
qq_file_header fh;
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
cursor = data;
Modified: trunk/libgaim/protocols/qq/group.c
===================================================================
--- trunk/libgaim/protocols/qq/group.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -37,7 +37,7 @@
{
guint32 external_group_id;
- g_return_if_fail(gc != NULL && input != NULL);
+ g_return_if_fail(input != NULL);
external_group_id = qq_string_to_dec_value(input);
/* 0x00000000 means search for demo group */
qq_send_cmd_group_search_group(gc, external_group_id);
@@ -46,7 +46,6 @@
static void _qq_group_search_cancel_callback(GaimConnection *gc, const gchar *input)
{
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
gaim_roomlist_set_in_progress(qd->roomlist, FALSE);
@@ -88,7 +87,6 @@
GaimRoomlist *rl;
GaimRoomlistField *f;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
qd = (qq_data *) gc->proto_data;
fields = NULL;
@@ -136,9 +134,7 @@
g_return_if_fail(list != NULL);
gc = gaim_account_get_connection(list->account);
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
-
gaim_roomlist_set_in_progress(list, FALSE);
gaim_roomlist_unref(list);
}
@@ -153,10 +149,8 @@
GaimBlistNode *node;
qq_group *group;
- g_return_if_fail(gc != NULL);
account = gaim_connection_get_account(gc);
-
gaim_group = gaim_find_group(GAIM_GROUP_QQ_QUN);
if (gaim_group == NULL) {
gaim_debug(GAIM_DEBUG_INFO, "QQ", "We have no QQ Qun\n");
Modified: trunk/libgaim/protocols/qq/group_conv.c
===================================================================
--- trunk/libgaim/protocols/qq/group_conv.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_conv.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -34,7 +34,7 @@
GaimConversation *conv;
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
qd = (qq_data *) gc->proto_data;
conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,
@@ -51,7 +51,7 @@
gchar *member_name;
GaimConversation *conv;
gint flag;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
names = NULL;
flags = NULL;
Modified: trunk/libgaim/protocols/qq/group_find.c
===================================================================
--- trunk/libgaim/protocols/qq/group_find.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_find.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -37,8 +37,6 @@
qq_data *qd;
group_packet *p;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, FALSE);
-
if (internal_group_id == NULL)
return FALSE;
qd = (qq_data *) gc->proto_data;
@@ -100,7 +98,7 @@
{
qq_buddy *member, *q_bud;
GaimBuddy *buddy;
- g_return_val_if_fail(gc != NULL && group != NULL && member_uid > 0, NULL);
+ g_return_val_if_fail(group != NULL && member_uid > 0, NULL);
member = qq_group_find_member_by_uid(group, member_uid);
if (member == NULL) { /* first appear during my session */
@@ -128,7 +126,6 @@
qq_group *group;
GList *list;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
qd = (qq_data *) gc->proto_data;
conv = gaim_find_chat(gc, channel);
@@ -153,7 +150,6 @@
qq_group *group;
qq_data *qd;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
qd = (qq_data *) gc->proto_data;
if (qd->groups == NULL || id <= 0)
Modified: trunk/libgaim/protocols/qq/group_im.c
===================================================================
--- trunk/libgaim/protocols/qq/group_im.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_im.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -58,7 +58,7 @@
guint16 msg_len;
gchar *msg_filtered;
- g_return_if_fail(gc != NULL && group != NULL && msg != NULL);
+ g_return_if_fail(group != NULL && msg != NULL);
msg_filtered = gaim_markup_strip_html(msg);
msg_len = strlen(msg_filtered);
@@ -102,7 +102,7 @@
gchar *reason_utf8, *msg, *reason;
group_member_opt *g;
- g_return_if_fail(gc != NULL && internal_group_id > 0 && data != NULL && len > 0);
+ g_return_if_fail(internal_group_id > 0 && data != NULL && len > 0);
if (*cursor >= (data + len - 1)) {
gaim_debug(GAIM_DEBUG_WARNING, "QQ", "Received group msg apply_join is empty\n");
@@ -150,7 +150,7 @@
gchar *reason_utf8, *msg, *reason;
qq_group *group;
- g_return_if_fail(gc != NULL && data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
if (*cursor >= (data + len - 1)) {
gaim_debug(GAIM_DEBUG_WARNING, "QQ", "Received group msg been_rejected is empty\n");
@@ -191,7 +191,7 @@
gchar *reason_utf8, *msg;
qq_group *group;
- g_return_if_fail(gc != NULL && data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
if (*cursor >= (data + len - 1)) {
gaim_debug(GAIM_DEBUG_WARNING, "QQ", "Received group msg been_approved is empty\n");
@@ -230,7 +230,7 @@
gchar *msg;
qq_group *group;
- g_return_if_fail(gc != NULL && data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
if (*cursor >= (data + len - 1)) {
gaim_debug(GAIM_DEBUG_WARNING, "QQ", "Received group msg been_removed is empty\n");
@@ -264,7 +264,7 @@
qq_group *group;
gchar *msg;
- g_return_if_fail(gc != NULL && data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
if (*cursor >= (data + len - 1)) {
gaim_debug(GAIM_DEBUG_WARNING, "QQ", "Received group msg been_added is empty\n");
@@ -309,7 +309,7 @@
qq_recv_group_im *im_group;
gint skip_len;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && data != NULL && data_len > 0);
+ g_return_if_fail(data != NULL && data_len > 0);
qd = (qq_data *) gc->proto_data;
gaim_debug(GAIM_DEBUG_INFO, "QQ",
Modified: trunk/libgaim/protocols/qq/group_info.c
===================================================================
--- trunk/libgaim/protocols/qq/group_info.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_info.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -64,7 +64,7 @@
guint8 *raw_data, *cursor;
gint bytes, data_len;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
data_len = 5;
raw_data = g_newa(guint8, data_len);
@@ -87,7 +87,7 @@
guint8 *raw_data, *cursor;
gint bytes, data_len;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
/* only get online members when conversation window is on */
if (NULL == gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT,group->group_name_utf8, gaim_connection_get_account(gc))) {
@@ -119,7 +119,7 @@
GList *list;
qq_buddy *member;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
for (i = 0, list = group->members; list != NULL; list = list->next) {
member = (qq_buddy *) list->data;
if (_is_group_member_need_update_info(member))
@@ -168,7 +168,6 @@
guint32 unknown4;
guint8 unknown1;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(data != NULL && len > 0);
qd = (qq_data *) gc->proto_data;
@@ -250,7 +249,7 @@
qq_group *group;
qq_buddy *member;
- g_return_if_fail(gc != NULL && data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
if (data + len - *cursor < 4) {
gaim_debug(GAIM_DEBUG_ERROR, "QQ", "Invalid group online member reply, discard it!\n");
@@ -296,7 +295,7 @@
qq_group *group;
qq_buddy *member;
- g_return_if_fail(gc != NULL && data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
read_packet_dw(data, cursor, len, &internal_group_id);
g_return_if_fail(internal_group_id > 0);
Modified: trunk/libgaim/protocols/qq/group_internal.c
===================================================================
--- trunk/libgaim/protocols/qq/group_internal.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_internal.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -76,7 +76,6 @@
qq_group *group;
qq_data *qd;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
g_return_val_if_fail(internal_id > 0, NULL);
qd = (qq_data *) gc->proto_data;
@@ -104,7 +103,6 @@
{
qq_group *group;
GList *list;
- g_return_if_fail(qd != NULL);
list = qd->groups;
while (list != NULL) {
@@ -148,7 +146,6 @@
qq_data *qd;
qq_group *group;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
g_return_val_if_fail(data != NULL, NULL);
qd = (qq_data *) gc->proto_data;
@@ -181,7 +178,7 @@
{
GaimChat *chat;
gchar *external_group_id;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
external_group_id = g_strdup_printf("%d", group->external_group_id);
chat = gaim_blist_find_chat(gaim_connection_get_account(gc), external_group_id);
Modified: trunk/libgaim/protocols/qq/group_join.c
===================================================================
--- trunk/libgaim/protocols/qq/group_join.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_join.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -48,7 +48,6 @@
guint32 internal_group_id;
qq_group *group;
- g_return_if_fail(g != NULL && g->gc != NULL && g->uid > 0);
gc = g->gc;
internal_group_id = g->uid;
@@ -64,7 +63,7 @@
guint8 *raw_data, *cursor;
gint bytes, data_len;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
if (group->my_status == QQ_GROUP_MEMBER_STATUS_NOT_MEMBER) {
group->my_status = QQ_GROUP_MEMBER_STATUS_APPLYING;
@@ -104,7 +103,6 @@
qq_group *group;
guint32 internal_group_id;
- g_return_if_fail(g != NULL && g->gc != NULL && g->uid > 0);
gc = g->gc;
internal_group_id = g->uid;
@@ -121,7 +119,7 @@
{
gchar *msg;
gc_and_uid *g;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
gaim_debug(GAIM_DEBUG_INFO, "QQ",
"Group (internal id: %d) needs authentication\n", group->internal_group_id);
@@ -145,7 +143,7 @@
gchar *reason_qq;
gint bytes, data_len;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
if (reason_utf8 == NULL || strlen(reason_utf8) == 0)
reason_qq = g_strdup("");
@@ -183,7 +181,7 @@
guint8 *raw_data, *cursor;
gint bytes, data_len;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
data_len = 5;
raw_data = g_newa(guint8, data_len);
@@ -209,7 +207,6 @@
qq_group *group;
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(data != NULL && len > 0);
qd = (qq_data *) gc->proto_data;
@@ -241,7 +238,6 @@
guint32 internal_group_id;
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(data != NULL && len > 0);
qd = (qq_data *) gc->proto_data;
@@ -267,7 +263,7 @@
guint8 reply;
qq_group *group;
- g_return_if_fail(gc != NULL && data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
bytes = 0;
expected_bytes = 5;
@@ -315,7 +311,7 @@
guint32 external_group_id;
qq_group *group;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && data != NULL);
+ g_return_if_fail(data != NULL);
qd = (qq_data *) gc->proto_data;
external_group_id_ptr = g_hash_table_lookup(data, QQ_GROUP_KEY_EXTERNAL_ID);
@@ -343,7 +339,7 @@
guint32 internal_group_id;
gc_and_uid *g;
- g_return_if_fail(gc != NULL && data != NULL);
+ g_return_if_fail(data != NULL);
internal_group_id_ptr = g_hash_table_lookup(data, "internal_group_id");
internal_group_id = strtol(internal_group_id_ptr, NULL, 10);
Modified: trunk/libgaim/protocols/qq/group_network.c
===================================================================
--- trunk/libgaim/protocols/qq/group_network.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_network.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -80,7 +80,7 @@
static void _qq_process_group_cmd_reply_error_default(guint8 reply, guint8 *cursor, gint len, GaimConnection *gc)
{
gchar *msg, *msg_utf8;
- g_return_if_fail(cursor != NULL && len > 0 && gc != NULL);
+ g_return_if_fail(cursor != NULL && len > 0);
msg = g_strndup((gchar *) cursor, len); /* it will append 0x00 */
msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
@@ -94,7 +94,7 @@
/* default process, dump only */
static void _qq_process_group_cmd_reply_default(guint8 *data, guint8 **cursor, gint len, GaimConnection *gc)
{
- g_return_if_fail(gc != NULL && data != NULL && len > 0);
+ g_return_if_fail(data != NULL && len > 0);
gaim_debug(GAIM_DEBUG_INFO, "QQ", "Dump unprocessed group cmd reply:\n%s", hex_dump_to_str(data, len));
}
@@ -104,11 +104,9 @@
qq_data *qd;
group_packet *p;
- g_return_if_fail(gc != NULL);
g_return_if_fail(raw_data != NULL && data_len > 0);
qd = (qq_data *) gc->proto_data;
- g_return_if_fail(qd != NULL);
qq_send_cmd(gc, QQ_CMD_GROUP_CMD, TRUE, 0, TRUE, raw_data, data_len);
@@ -132,7 +130,6 @@
guint32 internal_group_id;
guint8 *data, *cursor, sub_cmd, reply;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
Modified: trunk/libgaim/protocols/qq/group_opt.c
===================================================================
--- trunk/libgaim/protocols/qq/group_opt.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_opt.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -81,7 +81,7 @@
{
guint8 *data, *cursor;
gint i, count, data_len;
- g_return_if_fail(gc != NULL && group != NULL && members != NULL);
+ g_return_if_fail(members != NULL);
for (i = 0; members[i] != 0xffffffff; i++) {;
}
@@ -162,7 +162,7 @@
gint i = 0, old = 0, new = 0, del = 0, add = 0;
GList *list;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
qd = (qq_data *) gc->proto_data;
if (new_members[0] == 0xffffffff)
return;
@@ -214,7 +214,7 @@
{
guint32 internal_group_id;
qq_group *group;
- g_return_if_fail(data != NULL && gc != NULL);
+ g_return_if_fail(data != NULL);
read_packet_dw(data, cursor, len, &internal_group_id);
g_return_if_fail(internal_group_id > 0);
@@ -234,7 +234,7 @@
guint8 *data, *cursor;
gchar *group_name, *group_desc, *notice;
- g_return_if_fail(gc != NULL && group != NULL);
+ g_return_if_fail(group != NULL);
group_name = group->group_name_utf8 == NULL ? "" : utf8_to_qq(group->group_name_utf8, QQ_CHARSET_DEFAULT);
group_desc = group->group_desc_utf8 == NULL ? "" : utf8_to_qq(group->group_desc_utf8, QQ_CHARSET_DEFAULT);
@@ -283,7 +283,7 @@
{
guint32 internal_group_id;
qq_group *group;
- g_return_if_fail(data != NULL && gc != NULL);
+ g_return_if_fail(data != NULL);
read_packet_dw(data, cursor, len, &internal_group_id);
g_return_if_fail(internal_group_id > 0);
@@ -304,7 +304,7 @@
gint data_len, data_written;
guint8 *data, *cursor;
qq_data *qd;
- g_return_if_fail(gc != NULL && name != NULL);
+ g_return_if_fail(name != NULL);
qd = (qq_data *) gc->proto_data;
data_len = 7 + 1 + strlen(name) + 2 + 1 + 1 + 4;
@@ -359,7 +359,7 @@
gc_and_uid *g;
qq_data *qd;
- g_return_if_fail(data != NULL && gc != NULL);
+ g_return_if_fail(data != NULL);
g_return_if_fail(gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
@@ -395,7 +395,7 @@
{
gint data_len, data_written;
guint8 *data, *cursor;
- g_return_if_fail(gc != NULL && internal_group_id > 0);
+ g_return_if_fail(internal_group_id > 0);
data_len = 5;
data = g_newa(guint8, data_len);
@@ -420,7 +420,7 @@
{
guint32 internal_group_id;
qq_group *group;
- g_return_if_fail(data != NULL && gc != NULL);
+ g_return_if_fail(data != NULL);
read_packet_dw(data, cursor, len, &internal_group_id);
g_return_if_fail(internal_group_id > 0);
@@ -438,7 +438,7 @@
guint32 internal_group_id;
qq_group *group;
- g_return_if_fail(gc != NULL && data != NULL);
+ g_return_if_fail(data != NULL);
internal_group_id_ptr = g_hash_table_lookup(data, "internal_group_id");
internal_group_id = strtol(internal_group_id_ptr, NULL, 10);
Modified: trunk/libgaim/protocols/qq/group_search.c
===================================================================
--- trunk/libgaim/protocols/qq/group_search.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/group_search.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -42,8 +42,6 @@
guint8 *raw_data, *cursor, type;
gint bytes, data_len;
- g_return_if_fail(gc != NULL);
-
data_len = 6;
raw_data = g_newa(guint8, data_len);
cursor = raw_data;
@@ -96,7 +94,6 @@
qq_group *group;
GSList *pending_id;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(data != NULL && len > 0);
qd = (qq_data *) gc->proto_data;
Modified: trunk/libgaim/protocols/qq/im.c
===================================================================
--- trunk/libgaim/protocols/qq/im.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/im.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -252,7 +252,7 @@
qq_data *qd;
qq_recv_normal_im_text *im_text;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && common != NULL);
+ g_return_if_fail(common != NULL);
qd = (qq_data *) gc->proto_data;
/* now it is QQ_NORMAL_IM_TEXT */
@@ -402,7 +402,7 @@
guint8 reply;
gchar **segments, *msg_utf8;
- g_return_if_fail(gc != NULL && data != NULL && data_len != 0);
+ g_return_if_fail(data != NULL && data_len != 0);
if (*cursor >= (data + data_len - 1)) {
gaim_debug(GAIM_DEBUG_WARNING, "QQ", "Received sys IM is empty\n");
@@ -435,8 +435,6 @@
gboolean is_bold = FALSE, is_italic = FALSE, is_underline = FALSE;
const gchar *start, *end, *last;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
client_tag = QQ_CLIENT;
normal_im_type = QQ_NORMAL_IM_TEXT;
@@ -554,7 +552,6 @@
gint len;
guint8 *data, *cursor, reply;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = gc->proto_data;
@@ -584,7 +581,6 @@
guint8 *data, *cursor;
qq_recv_im_header *im_header;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
Modified: trunk/libgaim/protocols/qq/keep_alive.c
===================================================================
--- trunk/libgaim/protocols/qq/keep_alive.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/keep_alive.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -46,8 +46,6 @@
qq_data *qd;
guint8 *raw_data, *cursor;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
raw_data = g_newa(guint8, 4);
cursor = raw_data;
@@ -67,7 +65,6 @@
gchar **segments;
guint8 *data;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -104,12 +101,9 @@
qq_data *qd;
qq_buddy *q_bud;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) (gc->proto_data);
now = time(NULL);
list = qd->buddies;
- g_return_if_fail(qd != NULL);
while (list != NULL) {
q_bud = (qq_buddy *) list->data;
@@ -128,7 +122,7 @@
GaimBuddy *bud;
gchar *status_id;
- g_return_if_fail(gc != NULL && q_bud != NULL);
+ g_return_if_fail(q_bud != NULL);
name = uid_to_gaim_name(q_bud->uid);
bud = gaim_find_buddy(gc->account, name);
Modified: trunk/libgaim/protocols/qq/login_logout.c
===================================================================
--- trunk/libgaim/protocols/qq/login_logout.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/login_logout.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -157,8 +157,6 @@
qq_data *qd;
qq_login_reply_ok_packet lrop;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, QQ_LOGIN_REPLY_MISC_ERROR);
-
qd = (qq_data *) gc->proto_data;
cursor = data;
bytes = 0;
@@ -251,8 +249,6 @@
qq_data *qd;
qq_login_reply_redirect_packet lrrp;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, QQ_LOGIN_REPLY_MISC_ERROR);
-
qd = (qq_data *) gc->proto_data;
cursor = data;
bytes = 0;
@@ -304,8 +300,6 @@
guint16 seq_ret;
gint bytes;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
buf = g_newa(guint8, MAX_PACKET_SIZE);
@@ -335,8 +329,6 @@
gint encrypted_len, bytes;
gint pos;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
buf = g_newa(guint8, MAX_PACKET_SIZE);
raw_data = g_newa(guint8, QQ_LOGIN_DATA_LENGTH);
@@ -391,7 +383,6 @@
{
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -422,8 +413,6 @@
gint i;
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
for (i = 0; i < 4; i++)
qq_send_cmd(gc, QQ_CMD_LOGOUT, FALSE, 0xffff, FALSE, qd->pwkey, QQ_KEY_LENGTH);
@@ -438,7 +427,6 @@
guint8 *data;
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
Modified: trunk/libgaim/protocols/qq/qq.c
===================================================================
--- trunk/libgaim/protocols/qq/qq.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/qq.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -314,7 +314,7 @@
gchar *msg, *msg_with_qq_smiley;
qq_data *qd;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL && who != NULL, -1);
+ g_return_val_if_fail(who != NULL, -1);
qd = (qq_data *) gc->proto_data;
@@ -343,7 +343,7 @@
gchar *msg, *msg_with_qq_smiley;
qq_group *group;
- g_return_val_if_fail(gc != NULL && message != NULL, -1);
+ g_return_val_if_fail(message != NULL, -1);
g_return_val_if_fail(strlen(message) <= QQ_MSG_IM_MAX, -E2BIG);
group = qq_group_find_by_channel(gc, channel);
@@ -364,7 +364,6 @@
guint32 uid;
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = gc->proto_data;
uid = gaim_name_to_uid(who);
@@ -383,8 +382,6 @@
GaimConnection *gc = (GaimConnection *) action->context;
qq_data *qd;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
qq_prepare_modify_info(gc);
}
@@ -395,7 +392,6 @@
GaimRequestField *field;
gint suffix;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
field = gaim_request_fields_get_field(fields, "face_num");
@@ -485,7 +481,7 @@
buddy = (GaimBuddy *) node;
gc = gaim_account_get_connection(buddy->account);
who = buddy->name;
- g_return_if_fail(gc != NULL && who != NULL);
+ g_return_if_fail(who != NULL);
uid = gaim_name_to_uid(who);
g_return_if_fail(uid > 0);
@@ -510,8 +506,6 @@
qq_data *qd;
GString *info;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
qd = (qq_data *) gc->proto_data;
info = g_string_new("<html><body>\n");
@@ -549,7 +543,6 @@
static void _qq_menu_create_permanent_group(GaimPluginAction * action)
{
GaimConnection *gc = (GaimConnection *) action->context;
- g_return_if_fail(gc != NULL);
gaim_request_input(gc, _("Create QQ Qun"),
_("Input Qun name here"),
_("Only QQ member can create permanent Qun"),
@@ -566,7 +559,7 @@
g_return_if_fail(GAIM_BLIST_NODE_IS_CHAT(node));
- g_return_if_fail(gc != NULL && components != NULL);
+ g_return_if_fail(components != NULL);
qq_group_exit(gc, components);
}
@@ -579,7 +572,7 @@
g_return_if_fail(GAIM_BLIST_NODE_IS_CHAT(node));
- g_return_if_fail(gc != NULL && components != NULL);
+ g_return_if_fail(components != NULL);
qq_group_manage_group(gc, components);
}
*/
@@ -765,7 +758,6 @@
gc = (GaimConnection *) action->context;
qd = (qq_data *) gc->proto_data;
- g_return_if_fail(gc != NULL && qd != NULL);
fields = gaim_request_fields_new();
group = gaim_request_field_group_new(_("Basic Elements"));
@@ -886,7 +878,6 @@
qq_data *qd;
GList *list;
- g_return_if_fail(gc != NULL);
if (NULL == (qd = (qq_data *) gc->proto_data))
return;
@@ -910,7 +901,7 @@
static void _qq_get_chat_buddy_info(GaimConnection *gc, gint channel, const gchar *who)
{
gchar *gaim_name;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL && who != NULL);
+ g_return_if_fail(who != NULL);
gaim_name = chat_name_to_gaim_name(who);
if (gaim_name != NULL)
@@ -921,7 +912,7 @@
/* who is the nickname of buddy in QQ chat-room (Qun) */
static gchar *_qq_get_chat_buddy_real_name(GaimConnection *gc, gint channel, const gchar *who)
{
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL && who != NULL, NULL);
+ g_return_val_if_fail(who != NULL, NULL);
return chat_name_to_gaim_name(who);
}
Modified: trunk/libgaim/protocols/qq/recv_core.c
===================================================================
--- trunk/libgaim/protocols/qq/recv_core.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/recv_core.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -63,7 +63,6 @@
qq_data *qd;
guint8 *byte, mask;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, FALSE);
qd = (qq_data *) gc->proto_data;
byte = &(qd->window[seq / 8]);
mask = (1 << (seq % 8));
@@ -72,7 +71,7 @@
return TRUE; /* check mask */
(*byte) |= mask;
return FALSE; /* set mask */
-} /* _qq_check_packet_set_window */
+}
/* default process, decrypt and dump */
static void _qq_process_packet_default(guint8 *buf, gint buf_len, guint16 cmd, guint16 seq, GaimConnection *gc)
@@ -82,7 +81,6 @@
gchar *msg_utf8;
gint len;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
@@ -111,7 +109,6 @@
qq_recv_msg_header header;
packet_before_login *b4_packet;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len > 0);
qd = (qq_data *) gc->proto_data;
@@ -297,8 +294,6 @@
gc = (GaimConnection *) data;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
if(cond != GAIM_INPUT_READ) {
gaim_connection_error(gc, _("Socket error"));
return;
Modified: trunk/libgaim/protocols/qq/send_core.c
===================================================================
--- trunk/libgaim/protocols/qq/send_core.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/send_core.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -40,8 +40,7 @@
qq_data *qd;
gint bytes_expected, bytes_written;
- g_return_val_if_fail(gc != NULL &&
- gc->proto_data != NULL && buf != NULL && cursor != NULL && *cursor != NULL, -1);
+ g_return_val_if_fail(buf != NULL && cursor != NULL && *cursor != NULL, -1);
qd = (qq_data *) gc->proto_data;
if (is_auto_seq)
@@ -80,8 +79,6 @@
gint bytes_sent;
guint8 *cursor;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
-
qd = (qq_data *) gc->proto_data;
if (qd->use_tcp) {
@@ -124,8 +121,6 @@
guint16 seq_ret;
gint encrypted_len, bytes_written, bytes_expected, bytes_sent;
- g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
-
qd = (qq_data *) gc->proto_data;
g_return_val_if_fail(qd->session_key != NULL, -1);
Modified: trunk/libgaim/protocols/qq/send_file.c
===================================================================
--- trunk/libgaim/protocols/qq/send_file.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/send_file.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -496,7 +496,6 @@
gint packet_len, bytes;
ft_info *info;
- g_return_if_fail (gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
info = (ft_info *) qd->xfer->data;
@@ -567,7 +566,6 @@
gint packet_len, bytes;
gaim_debug(GAIM_DEBUG_INFO, "_qq_send_packet_file_reject", "start");
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
packet_len = 64;
@@ -594,7 +592,6 @@
gint packet_len, bytes;
gaim_debug(GAIM_DEBUG_INFO, "_qq_send_packet_file_cancel", "start\n");
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
packet_len = 64;
@@ -631,7 +628,6 @@
g_return_if_fail (xfer != NULL);
account = gaim_xfer_get_account(xfer);
gc = gaim_account_get_connection(account);
- g_return_if_fail (gc != NULL && gc->proto_data != NULL);
to_uid = gaim_name_to_uid (xfer->who);
g_return_if_fail (to_uid != 0);
@@ -700,9 +696,9 @@
gchar *msg, *filename;
qq_data *qd;
- g_return_if_fail (gc != NULL && data != NULL && data_len != 0);
+ g_return_if_fail (data != NULL && data_len != 0);
qd = (qq_data *) gc->proto_data;
- g_return_if_fail (qd != NULL && qd->xfer != NULL);
+ g_return_if_fail (qd->xfer != NULL);
if (*cursor >= (data + data_len - 1)) {
gaim_debug (GAIM_DEBUG_WARNING, "QQ",
@@ -724,14 +720,14 @@
/* process cancel im for file transfer request */
void qq_process_recv_file_cancel (guint8 *data, guint8 **cursor, gint data_len,
- guint32 sender_uid, GaimConnection * gc)
+ guint32 sender_uid, GaimConnection *gc)
{
gchar *msg, *filename;
qq_data *qd;
- g_return_if_fail (gc != NULL && data != NULL && data_len != 0);
+ g_return_if_fail (data != NULL && data_len != 0);
qd = (qq_data *) gc->proto_data;
- g_return_if_fail (qd != NULL && qd->xfer != NULL
+ g_return_if_fail (qd->xfer != NULL
&& gaim_xfer_get_filename(qd->xfer) != NULL);
if (*cursor >= (data + data_len - 1)) {
@@ -753,13 +749,13 @@
/* process accept im for file transfer request */
void qq_process_recv_file_accept(guint8 *data, guint8 **cursor, gint data_len,
- guint32 sender_uid, GaimConnection * gc)
+ guint32 sender_uid, GaimConnection *gc)
{
qq_data *qd;
ft_info *info;
GaimXfer *xfer;
- g_return_if_fail (gc != NULL && data != NULL && data_len != 0);
+ g_return_if_fail (data != NULL && data_len != 0);
qd = (qq_data *) gc->proto_data;
xfer = qd->xfer;
@@ -790,7 +786,7 @@
GaimBuddy *b;
qq_buddy *q_bud;
- g_return_if_fail (gc != NULL && data != NULL && data_len != 0);
+ g_return_if_fail (data != NULL && data_len != 0);
qd = (qq_data *) gc->proto_data;
if (*cursor >= (data + data_len - 1)) {
@@ -892,7 +888,7 @@
ft_info *info;
GaimXfer *xfer;
- g_return_if_fail (gc != NULL && data != NULL && data_len != 0);
+ g_return_if_fail (data != NULL && data_len != 0);
qd = (qq_data *) gc->proto_data;
if (*cursor >= (data + data_len - 1)) {
@@ -925,7 +921,6 @@
qq_data *qd;
GaimXfer *xfer;
- g_return_if_fail (gc != NULL && gc->proto_data != NULL);
qd = (qq_data *) gc->proto_data;
xfer = gaim_xfer_new (gc->account, GAIM_XFER_SEND,
Modified: trunk/libgaim/protocols/qq/sendqueue.c
===================================================================
--- trunk/libgaim/protocols/qq/sendqueue.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/sendqueue.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -46,8 +46,6 @@
GList *list;
qq_sendpacket *p;
- g_return_if_fail(qd != NULL);
-
list = qd->sendqueue;
while (list != NULL) {
p = (qq_sendpacket *) (list->data);
Modified: trunk/libgaim/protocols/qq/sys_msg.c
===================================================================
--- trunk/libgaim/protocols/qq/sys_msg.c 2006-09-26 22:27:02 UTC (rev 17374)
+++ trunk/libgaim/protocols/qq/sys_msg.c 2006-09-26 22:54:24 UTC (rev 17375)
@@ -52,7 +52,6 @@
GaimAccount *account;
account = gaim_connection_get_account(gc);
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
log = gaim_log_new(GAIM_LOG_IM,
"systemim",
@@ -141,7 +140,7 @@
gc_and_uid *g;
gchar *name;
- g_return_if_fail(gc != NULL && from != NULL && to != NULL);
+ g_return_if_fail(from != NULL && to != NULL);
uid = strtol(from, NULL, 10);
name = uid_to_gaim_name(uid);
@@ -173,7 +172,7 @@
{
gchar *message, *reason;
- g_return_if_fail(gc != NULL && from != NULL && to != NULL);
+ g_return_if_fail(from != NULL && to != NULL);
message = g_strdup_printf(_("User %s rejected your request"), from);
reason = g_strdup_printf(_("Reason: %s"), msg_utf8);
@@ -190,7 +189,7 @@
gchar *message;
qq_data *qd;
- g_return_if_fail(gc != NULL && from != NULL && to != NULL);
+ g_return_if_fail(from != NULL && to != NULL);
qd = (qq_data *) gc->proto_data;
qq_add_buddy_by_recv_packet(gc, strtol(from, NULL, 10), TRUE, TRUE);
@@ -211,7 +210,7 @@
GaimBuddy *b;
gchar *name;
- g_return_if_fail(gc != NULL && from != NULL && to != NULL);
+ g_return_if_fail(from != NULL && to != NULL);
uid = strtol(from, NULL, 10);
g = g_new0(gc_and_uid, 1);
@@ -258,7 +257,6 @@
guint8 *data;
gchar **segments, *code, *from, *to, *msg, *msg_utf8;
- g_return_if_fail(gc != NULL && gc->proto_data != NULL);
g_return_if_fail(buf != NULL && buf_len != 0);
qd = (qq_data *) gc->proto_data;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-09-26 22:27:08
|
Revision: 17374
http://svn.sourceforge.net/gaim/?rev=17374&view=rev
Author: seanegan
Date: 2006-09-26 15:27:02 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
use a 96x96 crop from logo.png for Gaim News
Modified Paths:
--------------
web/planet/gaim/config.ini
Added Paths:
-----------
web/htdocs/logo.png
Added: web/htdocs/logo.png
===================================================================
(Binary files differ)
Property changes on: web/htdocs/logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: web/planet/gaim/config.ini
===================================================================
--- web/planet/gaim/config.ini 2006-09-26 22:14:12 UTC (rev 17373)
+++ web/planet/gaim/config.ini 2006-09-26 22:27:02 UTC (rev 17374)
@@ -21,4 +21,4 @@
[http://gaim.sourceforge.net/rss.php/news]
name = Gaim News
-face = http://gaim.sourceforge.net/images/gaim-logo.png
+face = http://gaim.sourceforge.net/logo.png
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sea...@us...> - 2006-09-26 22:14:15
|
Revision: 17373
http://svn.sourceforge.net/gaim/?rev=17373&view=rev
Author: seanegan
Date: 2006-09-26 15:14:12 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Add Gaim News to Planet Gaim
Modified Paths:
--------------
web/planet/gaim/config.ini
Modified: web/planet/gaim/config.ini
===================================================================
--- web/planet/gaim/config.ini 2006-09-26 21:52:23 UTC (rev 17372)
+++ web/planet/gaim/config.ini 2006-09-26 22:14:12 UTC (rev 17373)
@@ -18,3 +18,7 @@
[http://gaim.sourceforge.net/sean/blog/index.rss2]
name = Sean Egan
face = http://gaim.sourceforge.net/sean/face.jpg
+
+[http://gaim.sourceforge.net/rss.php/news]
+name = Gaim News
+face = http://gaim.sourceforge.net/images/gaim-logo.png
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.
