Opened 8 years ago

Closed 8 years ago

Last modified 8 years ago

#13525 closed patch (fixed)

[PATCH]Update internal libgadu to 1.10.1

Reported by: matekm Owned by: bartosz
Milestone: 2.8.0 Component: Gadu-Gadu
Version: 2.7.11 Keywords:
Cc:

Description

Hi,

I attached patch that updates internal libgadu to version 1.10.1. Thank to this gg prpl developers will have opportunity to implement new gg features like type notification, file sending, multilogin.

I tested this patch on Windows and it looks like it works great - I didn't notice any regresion. Unfortunatelly, I don't have access for linux machine so if You use gg prpl on linux please, check this patch and post an update (I will have a chance to check this update on linux in next friday).

Attachments (4)

ggupdate.diff (165.5 KB) - added by matekm 8 years ago.
Patch updating internal libgadu to version 1.10.1
gginternal1101.patch (165.5 KB) - added by kkszysiu 8 years ago.
gginternal1101.2.patch (258.5 KB) - added by kkszysiu 8 years ago.
gginternal1101.3.patch (258.0 KB) - added by matekm 8 years ago.
Update internal copy - final patch version rev 1

Download all attachments as: .zip

Change History (24)

comment:1 Changed 8 years ago by tomkiewicz

Patch doesn't apply well for me - have you tested it with 2.7.11?

I have conflicts in libgadu.h file - 27 successful hunks (offset -1 lines) and one failed at 2192. I tried to resolve it, but finally gadu-gadu didn't worked for me after it (under linux).

comment:2 Changed 8 years ago by matekm

I tested it on the newest code from repo - even now I updated main pidgin repo and applied this patch - everything worked great, zero information about conflicts.

H:\PidginDevel\pidgin-src>patch -p0 < ggupdate.diff
patching file libpurple/protocols/gg/Makefile.mingw
patching file libpurple/protocols/gg/lib/COPYING
patching file libpurple/protocols/gg/lib/common.c
patching file libpurple/protocols/gg/lib/dcc.c
patching file libpurple/protocols/gg/lib/events.c
patching file libpurple/protocols/gg/lib/http.c
patching file libpurple/protocols/gg/lib/libgadu.c
patching file libpurple/protocols/gg/lib/libgadu.h
patching file libpurple/protocols/gg/lib/obsolete.c
patching file libpurple/protocols/gg/lib/pubdir50.c
patching file libpurple/protocols/gg/lib/dcc7.c
patching file libpurple/protocols/gg/lib/libgadu-internal.h
patching file libpurple/protocols/gg/lib/protocol.h
patching file libpurple/protocols/gg/lib/resolver.c
patching file libpurple/protocols/gg/lib/resolver.h
patching file libpurple/protocols/gg/lib/debug.c
patching file libpurple/protocols/gg/lib/encoding.c
patching file libpurple/protocols/gg/lib/encoding.h
patching file libpurple/protocols/gg/lib/handlers.c
patching file libpurple/protocols/gg/lib/libgadu-debug.h
patching file libpurple/protocols/gg/lib/message.c
patching file libpurple/protocols/gg/lib/message.h
patching file libpurple/protocols/gg/lib/session.h

How the conflict looked like? Did You updated repo before applying this patch?

Changed 8 years ago by matekm

Patch updating internal libgadu to version 1.10.1

comment:3 Changed 8 years ago by matekm

I updated patch, last time I forgot add new libgg files to Makefile.am

comment:4 follow-up: Changed 8 years ago by kkszysiu

I did it too but forgot to attach patch :D I will see how's your patch working under Linux then if everything will be fine I will make new tickets related to multilogin and typing notifications (got them working last week :)) and we see whats next :)

Great work, BTW!

comment:5 Changed 8 years ago by tomkiewicz

I tried it with 2.7.11 version, probably current version from repo is slightly different. I will try it out later.

comment:6 in reply to: ↑ 4 Changed 8 years ago by rekkanoryo

Replying to kkszysiu:

I will see how's your patch working under Linux


If you say this patch is fine, I will commit it. This should close a couple tickets for us.

Changed 8 years ago by kkszysiu

Changed 8 years ago by kkszysiu

comment:7 Changed 8 years ago by kkszysiu

Commit my second patch into repo rekkanoryo. I've added some missing files. Should work without any problems now. If you can, please update required libgadu external version to 1.10.1 too :)

Changed 8 years ago by matekm

Update internal copy - final patch version rev 1

comment:8 Changed 8 years ago by matekm

There were some build errors on Windows - fixed that with new patch. I think we're ready to commit;)

comment:9 Changed 8 years ago by tomkiewicz

I have just tested gginternal1101.3.patch - works fine for me under Linux.

comment:10 Changed 8 years ago by kkszysiu

Great! :) rekkanoryo, could you commit it to main repo, please? :)

comment:11 Changed 8 years ago by tomkiewicz

I found out, that new libgadu sometimes puts NULL pointer as message contents. In example, when somebody sends us large images (#13554). It would be nice to handle that NULL pointer instead of "displaying" it - i have already made patch for it: http://developer.pidgin.im/attachment/ticket/13554/pidgin-gg-empty-messages-2.patch.

Fortunately, g_strdup_printf (which gets that pointer) is safe. I mean, it don't throw any null pointer exceptions nor segfaults, but just convert NULL string to "(null)".

comment:12 Changed 8 years ago by rekkanoryo@…

  • Milestone set to 2.8.0
  • Resolution set to fixed
  • Status changed from new to closed

(In 989280fb2fb829420f7ecd32ecc913d5feded7ce):
Credit matekm and kkszysiu for their patch. Fixes #13525.

comment:13 Changed 8 years ago by rekkanoryo@…

(In 7794dbfb58dd234dc7a7095bfa2b9e0b8de1c29e):
Raise minimum external libgadu requirement to 1.10.1. Refs #13525.

comment:14 Changed 8 years ago by rekkanoryo@…

(In ac63d36c575132f8f2454612c50eb65ca8f2c72b):
I forgot to ChangeLog that last one. Refs #13525.

comment:15 Changed 8 years ago by matekm

Hi rekkanoryo - could You credit me in the ChangeLog with name "Robert Matusewicz" too:)? Thanks in advance!

comment:16 Changed 8 years ago by rekkanoryo

Sorry about that, matekm, I had you confused with the author of the patch on #13358. You and kkszysiu were supposed to be the only ones credited for the patch.

comment:17 Changed 8 years ago by rekkanoryo@…

(In e09bd8ef4e2e4b4135f856ccda842c74fdd69f24):
Correct attribution in ChangeLog. Refs #13525.

comment:18 Changed 8 years ago by kkszysiu

Please look into #13590 too :)

comment:19 Changed 8 years ago by tomkiewicz

Minimum external required libgadu version is raised to 1.10.1, but the messages are not.

In file configure.ac we have to replace two occurrences of "1.9.0-rc2" with "1.10.1".

comment:20 Changed 8 years ago by elb@…

(In 649c72408dd9527b22c5e15aced51c15e325d4bb):
Update configure.ac to indicate the correct libgadu requirement in messages.

References #13525

Note: See TracTickets for help on using tickets.
All information, including names and email addresses, entered onto this website or sent to mailing lists affiliated with this website will be public. Do not post confidential information, especially passwords!