Kolejny tag 1.8.0.

configure.ac

@@ -49,6 +49,9 @@ if test "x$STDINT_H" = "xsys/types.h"; then
 	AC_DEFINE([GG_CONFIG_HAVE_SYS_TYPES_H], [], [Defined if uintX_t types are defined in <sys/types.h>.])
 fi
 
+AC_DEFINE([GG_LIBGADU_VERSION], [], [Library version])
+AC_DEFINE_UNQUOTED(GG_LIBGADU_VERSION, "${VERSION}")
+
 dnl SunOS
 
 AC_CHECK_LIB(nsl, t_accept, LIBS="$LIBS -lnsl")

include/libgadu.h.in

@@ -1295,13 +1295,13 @@ int gg_dcc7_handle_reject(struct gg_session *sess, struct gg_event *e, void *pay
 #define GG_HTTPS_PORT 443
 #define GG_HTTP_USERAGENT "Mozilla/4.7 [en] (Win98; I)"
 
-#define GG_DEFAULT_CLIENT_VERSION "6, 1, 0, 158"
-#define GG_DEFAULT_PROTOCOL_VERSION 0x24
+#define GG_DEFAULT_CLIENT_VERSION "7, 7, 0, 3351"
+#define GG_DEFAULT_PROTOCOL_VERSION 0x2a
 #define GG_DEFAULT_TIMEOUT 30
 #define GG_HAS_AUDIO_MASK 0x40000000
 #define GG_HAS_AUDIO7_MASK 0x20000000
 #define GG_ERA_OMNIX_MASK 0x04000000
-#define GG_LIBGADU_VERSION "CVS"
+#undef GG_LIBGADU_VERSION
 
 #define GG_DEFAULT_DCC_PORT 1550
 

src/events.c

@@ -1140,7 +1140,7 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			char buf[1024], *client, *auth;
 			int res = 0;
 			unsigned int res_size = sizeof(res);
-			const char *host, *appmsg;
+			const char *host, *appmsg, *fmt;
 
 			gg_debug_session(sess, GG_DEBUG_MISC, "// gg_watch_fd() GG_STATE_CONNECTING_HUB\n");
 
@@ -1168,21 +1168,25 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 				host = "";
 
 #ifdef GG_CONFIG_HAVE_OPENSSL
-			if (sess->ssl)
+			if (sess->ssl) {
 				appmsg = "appmsg3.asp";
-			else
+				fmt = "";
+			} else
 #endif
-				appmsg = "appmsg2.asp";
+			{
+				appmsg = "appmsg4.asp";
+				fmt = "&fmt=2";
+			}
 
 			auth = gg_proxy_auth();
 
 			snprintf(buf, sizeof(buf) - 1,
-				"GET %s/appsvc/%s?fmnumber=%u&version=%s&lastmsg=%d HTTP/1.0\r\n"
+				"GET %s/appsvc/%s?fmnumber=%u&version=%s%s&lastmsg=%d HTTP/1.0\r\n"
 				"Host: " GG_APPMSG_HOST "\r\n"
 				"User-Agent: " GG_HTTP_USERAGENT "\r\n"
 				"Pragma: no-cache\r\n"
 				"%s"
-				"\r\n", host, appmsg, sess->uin, client, sess->last_sysmsg, (auth) ? auth : "");
+				"\r\n", host, appmsg, sess->uin, client, fmt, sess->last_sysmsg, (auth) ? auth : "");
 
 			if (auth)
 				free(auth);
@@ -1280,6 +1284,15 @@ struct gg_event *gg_watch_fd(struct gg_session *sess)
 			/* analizujemy otrzymane dane. */
 			tmp = buf;
 
+#ifdef GG_CONFIG_HAVE_OPENSSL
+			if (!sess->ssl)
+#endif
+			{
+				while (*tmp && *tmp != ' ')
+					tmp++;
+				while (*tmp && *tmp == ' ')
+					tmp++;
+			}
 			while (*tmp && *tmp != ' ')
 				tmp++;
 			while (*tmp && *tmp == ' ')