Mercurial > pidgin.yaz
changeset 19278:9a8bb33fc60a
merge of 'c6cd7cce984b6e47dfbce5041ac4bd47a1267e05'
and 'fe19bc6b502b24b00a8fb3c3560dcb3171bd29d1'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Fri, 17 Aug 2007 01:54:19 +0000 |
| parents | f821d4bffb0a (current diff) 708a8b97ba87 (diff) |
| children | 39779b201e7c |
| files | libpurple/protocols/bonjour/mdns_howl.h libpurple/protocols/bonjour/mdns_win32.h pidgin/pixmaps/emotes/default/22/Makefile.am pidgin/pixmaps/emotes/default/22/Makefile.mingw pidgin/pixmaps/emotes/default/22/act-up.png pidgin/pixmaps/emotes/default/22/airplane.png pidgin/pixmaps/emotes/default/22/alien.png pidgin/pixmaps/emotes/default/22/angel.png pidgin/pixmaps/emotes/default/22/angry.png pidgin/pixmaps/emotes/default/22/arrogant.png pidgin/pixmaps/emotes/default/22/at-wits-end.png pidgin/pixmaps/emotes/default/22/bad.png pidgin/pixmaps/emotes/default/22/bashful.png pidgin/pixmaps/emotes/default/22/beat-up.png pidgin/pixmaps/emotes/default/22/beauty.png pidgin/pixmaps/emotes/default/22/beer.png pidgin/pixmaps/emotes/default/22/blowkiss.png pidgin/pixmaps/emotes/default/22/bomb.png pidgin/pixmaps/emotes/default/22/bowl.png pidgin/pixmaps/emotes/default/22/boy.png pidgin/pixmaps/emotes/default/22/brb.png pidgin/pixmaps/emotes/default/22/bye.png pidgin/pixmaps/emotes/default/22/cake.png pidgin/pixmaps/emotes/default/22/call-me.png pidgin/pixmaps/emotes/default/22/camera.png pidgin/pixmaps/emotes/default/22/can.png pidgin/pixmaps/emotes/default/22/car.png pidgin/pixmaps/emotes/default/22/cat.png pidgin/pixmaps/emotes/default/22/chicken.png pidgin/pixmaps/emotes/default/22/clap.png pidgin/pixmaps/emotes/default/22/clock.png pidgin/pixmaps/emotes/default/22/cloudy.png pidgin/pixmaps/emotes/default/22/clover.png pidgin/pixmaps/emotes/default/22/clown.png pidgin/pixmaps/emotes/default/22/coffee.png pidgin/pixmaps/emotes/default/22/coins.png pidgin/pixmaps/emotes/default/22/computer.png pidgin/pixmaps/emotes/default/22/confused.png pidgin/pixmaps/emotes/default/22/console.png pidgin/pixmaps/emotes/default/22/cow.png pidgin/pixmaps/emotes/default/22/cowboy.png pidgin/pixmaps/emotes/default/22/crying.png pidgin/pixmaps/emotes/default/22/curl-lip.png pidgin/pixmaps/emotes/default/22/curse.png pidgin/pixmaps/emotes/default/22/cute.png pidgin/pixmaps/emotes/default/22/dance.png pidgin/pixmaps/emotes/default/22/dazed.png pidgin/pixmaps/emotes/default/22/default.theme.in pidgin/pixmaps/emotes/default/22/desire.png pidgin/pixmaps/emotes/default/22/devil.png pidgin/pixmaps/emotes/default/22/disapointed.png pidgin/pixmaps/emotes/default/22/disdain.png pidgin/pixmaps/emotes/default/22/doctor.png pidgin/pixmaps/emotes/default/22/dog.png pidgin/pixmaps/emotes/default/22/doh.png pidgin/pixmaps/emotes/default/22/dont-know.png pidgin/pixmaps/emotes/default/22/drink.png pidgin/pixmaps/emotes/default/22/drool.png pidgin/pixmaps/emotes/default/22/eat.png pidgin/pixmaps/emotes/default/22/embarrassed.png pidgin/pixmaps/emotes/default/22/excruciating.png pidgin/pixmaps/emotes/default/22/eyeroll.png pidgin/pixmaps/emotes/default/22/female-fighter.png pidgin/pixmaps/emotes/default/22/film.png pidgin/pixmaps/emotes/default/22/fingers-crossed.png pidgin/pixmaps/emotes/default/22/flag.png pidgin/pixmaps/emotes/default/22/foot-in-mouth.png pidgin/pixmaps/emotes/default/22/freaked-out.png pidgin/pixmaps/emotes/default/22/ghost.png pidgin/pixmaps/emotes/default/22/giggle.png pidgin/pixmaps/emotes/default/22/girl.png pidgin/pixmaps/emotes/default/22/glasses-cool.png pidgin/pixmaps/emotes/default/22/glasses-nerdy.png pidgin/pixmaps/emotes/default/22/go-away.png pidgin/pixmaps/emotes/default/22/goat.png pidgin/pixmaps/emotes/default/22/good.png pidgin/pixmaps/emotes/default/22/hammer.png pidgin/pixmaps/emotes/default/22/handcuffs.png pidgin/pixmaps/emotes/default/22/handshake.png pidgin/pixmaps/emotes/default/22/highfive.png pidgin/pixmaps/emotes/default/22/hug-left.png pidgin/pixmaps/emotes/default/22/hug-right.png pidgin/pixmaps/emotes/default/22/hungry.png pidgin/pixmaps/emotes/default/22/hypnotized.png pidgin/pixmaps/emotes/default/22/in-love.png pidgin/pixmaps/emotes/default/22/island.png pidgin/pixmaps/emotes/default/22/jump.png pidgin/pixmaps/emotes/default/22/kiss.png pidgin/pixmaps/emotes/default/22/knife.png pidgin/pixmaps/emotes/default/22/lamp.png pidgin/pixmaps/emotes/default/22/lashes.png pidgin/pixmaps/emotes/default/22/laugh.png pidgin/pixmaps/emotes/default/22/liquor.png pidgin/pixmaps/emotes/default/22/love-over.png pidgin/pixmaps/emotes/default/22/love.png pidgin/pixmaps/emotes/default/22/lying.png pidgin/pixmaps/emotes/default/22/mad-tongue.png pidgin/pixmaps/emotes/default/22/mail.png pidgin/pixmaps/emotes/default/22/mean.png pidgin/pixmaps/emotes/default/22/meeting.png pidgin/pixmaps/emotes/default/22/mobile.png pidgin/pixmaps/emotes/default/22/moneymouth.png pidgin/pixmaps/emotes/default/22/monkey.png pidgin/pixmaps/emotes/default/22/moon.png pidgin/pixmaps/emotes/default/22/msn-away.png pidgin/pixmaps/emotes/default/22/msn-busy.png pidgin/pixmaps/emotes/default/22/msn.png pidgin/pixmaps/emotes/default/22/msn_online.png pidgin/pixmaps/emotes/default/22/musical-note.png pidgin/pixmaps/emotes/default/22/nailbiting.png pidgin/pixmaps/emotes/default/22/neutral.png pidgin/pixmaps/emotes/default/22/on-the-phone.png pidgin/pixmaps/emotes/default/22/party.png pidgin/pixmaps/emotes/default/22/peace.png pidgin/pixmaps/emotes/default/22/phone.png pidgin/pixmaps/emotes/default/22/pig.png pidgin/pixmaps/emotes/default/22/pill.png pidgin/pixmaps/emotes/default/22/pissed-off.png pidgin/pixmaps/emotes/default/22/pizza.png pidgin/pixmaps/emotes/default/22/plate.png pidgin/pixmaps/emotes/default/22/poop.png pidgin/pixmaps/emotes/default/22/pray.png pidgin/pixmaps/emotes/default/22/present.png pidgin/pixmaps/emotes/default/22/pumpkin.png pidgin/pixmaps/emotes/default/22/qq.png pidgin/pixmaps/emotes/default/22/question.png pidgin/pixmaps/emotes/default/22/quiet.png pidgin/pixmaps/emotes/default/22/rain.png pidgin/pixmaps/emotes/default/22/rainbow.png pidgin/pixmaps/emotes/default/22/rose-dead.png pidgin/pixmaps/emotes/default/22/rose.png pidgin/pixmaps/emotes/default/22/rotfl.png pidgin/pixmaps/emotes/default/22/sad.png pidgin/pixmaps/emotes/default/22/sarcastic.png pidgin/pixmaps/emotes/default/22/scalable/Makefile.am pidgin/pixmaps/emotes/default/22/scalable/act-up.svg pidgin/pixmaps/emotes/default/22/scalable/airplane.svg pidgin/pixmaps/emotes/default/22/scalable/alien.svg pidgin/pixmaps/emotes/default/22/scalable/angel.svg pidgin/pixmaps/emotes/default/22/scalable/angry.svg pidgin/pixmaps/emotes/default/22/scalable/arrogant.svg pidgin/pixmaps/emotes/default/22/scalable/bad.svg pidgin/pixmaps/emotes/default/22/scalable/bashful.svg pidgin/pixmaps/emotes/default/22/scalable/beat-up.svg pidgin/pixmaps/emotes/default/22/scalable/beauty.svg pidgin/pixmaps/emotes/default/22/scalable/beer.svg pidgin/pixmaps/emotes/default/22/scalable/blowkiss.svg pidgin/pixmaps/emotes/default/22/scalable/bomb.svg pidgin/pixmaps/emotes/default/22/scalable/bowl.svg pidgin/pixmaps/emotes/default/22/scalable/boy.svg pidgin/pixmaps/emotes/default/22/scalable/brb.svg pidgin/pixmaps/emotes/default/22/scalable/bye.svg pidgin/pixmaps/emotes/default/22/scalable/cake.svg pidgin/pixmaps/emotes/default/22/scalable/call-me.svg pidgin/pixmaps/emotes/default/22/scalable/camera.svg pidgin/pixmaps/emotes/default/22/scalable/can.svg pidgin/pixmaps/emotes/default/22/scalable/car.svg pidgin/pixmaps/emotes/default/22/scalable/cat.svg pidgin/pixmaps/emotes/default/22/scalable/chicken.svg pidgin/pixmaps/emotes/default/22/scalable/clap.svg pidgin/pixmaps/emotes/default/22/scalable/clock.svg pidgin/pixmaps/emotes/default/22/scalable/cloudy.svg pidgin/pixmaps/emotes/default/22/scalable/clover.svg pidgin/pixmaps/emotes/default/22/scalable/clown.svg pidgin/pixmaps/emotes/default/22/scalable/coffee.svg pidgin/pixmaps/emotes/default/22/scalable/coins.svg pidgin/pixmaps/emotes/default/22/scalable/computer.svg pidgin/pixmaps/emotes/default/22/scalable/confused.svg pidgin/pixmaps/emotes/default/22/scalable/console.svg pidgin/pixmaps/emotes/default/22/scalable/cow.svg pidgin/pixmaps/emotes/default/22/scalable/crying.svg pidgin/pixmaps/emotes/default/22/scalable/curl-lip.svg pidgin/pixmaps/emotes/default/22/scalable/curse.svg pidgin/pixmaps/emotes/default/22/scalable/cute.svg pidgin/pixmaps/emotes/default/22/scalable/dance.svg pidgin/pixmaps/emotes/default/22/scalable/dazed.svg pidgin/pixmaps/emotes/default/22/scalable/desire.svg pidgin/pixmaps/emotes/default/22/scalable/devil.svg pidgin/pixmaps/emotes/default/22/scalable/disapointed.svg pidgin/pixmaps/emotes/default/22/scalable/disdain.svg pidgin/pixmaps/emotes/default/22/scalable/doctor.svg pidgin/pixmaps/emotes/default/22/scalable/dog.svg pidgin/pixmaps/emotes/default/22/scalable/doh.svg pidgin/pixmaps/emotes/default/22/scalable/dont-know.svg pidgin/pixmaps/emotes/default/22/scalable/drink.svg pidgin/pixmaps/emotes/default/22/scalable/drool.svg pidgin/pixmaps/emotes/default/22/scalable/eat.svg pidgin/pixmaps/emotes/default/22/scalable/embarrassed.svg pidgin/pixmaps/emotes/default/22/scalable/excruciating.svg pidgin/pixmaps/emotes/default/22/scalable/eyeroll.svg pidgin/pixmaps/emotes/default/22/scalable/film.svg pidgin/pixmaps/emotes/default/22/scalable/fingers-crossed.svg pidgin/pixmaps/emotes/default/22/scalable/flag.svg pidgin/pixmaps/emotes/default/22/scalable/foot-in-mouth.svg pidgin/pixmaps/emotes/default/22/scalable/freaked-out.svg pidgin/pixmaps/emotes/default/22/scalable/ghost.svg pidgin/pixmaps/emotes/default/22/scalable/girl.svg pidgin/pixmaps/emotes/default/22/scalable/glasses-cool.svg pidgin/pixmaps/emotes/default/22/scalable/glasses-nerdy.svg pidgin/pixmaps/emotes/default/22/scalable/go-away.svg pidgin/pixmaps/emotes/default/22/scalable/goat.svg pidgin/pixmaps/emotes/default/22/scalable/good.svg pidgin/pixmaps/emotes/default/22/scalable/hammer.svg pidgin/pixmaps/emotes/default/22/scalable/handcuffs.svg pidgin/pixmaps/emotes/default/22/scalable/handshake.svg pidgin/pixmaps/emotes/default/22/scalable/highfive.svg pidgin/pixmaps/emotes/default/22/scalable/hug-left.svg pidgin/pixmaps/emotes/default/22/scalable/hug-right.svg pidgin/pixmaps/emotes/default/22/scalable/hypnotized.svg pidgin/pixmaps/emotes/default/22/scalable/in-love.svg pidgin/pixmaps/emotes/default/22/scalable/island.svg pidgin/pixmaps/emotes/default/22/scalable/jump.svg pidgin/pixmaps/emotes/default/22/scalable/knife.svg pidgin/pixmaps/emotes/default/22/scalable/lamp.svg pidgin/pixmaps/emotes/default/22/scalable/lashes.svg pidgin/pixmaps/emotes/default/22/scalable/laugh.svg pidgin/pixmaps/emotes/default/22/scalable/liquor.svg pidgin/pixmaps/emotes/default/22/scalable/love-over.svg pidgin/pixmaps/emotes/default/22/scalable/love.svg pidgin/pixmaps/emotes/default/22/scalable/lying.svg pidgin/pixmaps/emotes/default/22/scalable/mail.svg pidgin/pixmaps/emotes/default/22/scalable/mean.svg pidgin/pixmaps/emotes/default/22/scalable/meeting.svg pidgin/pixmaps/emotes/default/22/scalable/mobile.svg pidgin/pixmaps/emotes/default/22/scalable/moneymouth.svg pidgin/pixmaps/emotes/default/22/scalable/monkey.svg pidgin/pixmaps/emotes/default/22/scalable/moon.svg pidgin/pixmaps/emotes/default/22/scalable/msn-away.svg pidgin/pixmaps/emotes/default/22/scalable/msn-busy.svg pidgin/pixmaps/emotes/default/22/scalable/msn.svg pidgin/pixmaps/emotes/default/22/scalable/msn_online.svg pidgin/pixmaps/emotes/default/22/scalable/musical-note.svg pidgin/pixmaps/emotes/default/22/scalable/neutral.svg pidgin/pixmaps/emotes/default/22/scalable/party.svg pidgin/pixmaps/emotes/default/22/scalable/peace.svg pidgin/pixmaps/emotes/default/22/scalable/phone.svg pidgin/pixmaps/emotes/default/22/scalable/pig.svg pidgin/pixmaps/emotes/default/22/scalable/pill.svg pidgin/pixmaps/emotes/default/22/scalable/pissed-off.svg pidgin/pixmaps/emotes/default/22/scalable/pizza.svg pidgin/pixmaps/emotes/default/22/scalable/plate.svg pidgin/pixmaps/emotes/default/22/scalable/poop.svg pidgin/pixmaps/emotes/default/22/scalable/pray.svg pidgin/pixmaps/emotes/default/22/scalable/present.svg pidgin/pixmaps/emotes/default/22/scalable/question.svg pidgin/pixmaps/emotes/default/22/scalable/quiet.svg pidgin/pixmaps/emotes/default/22/scalable/rain.svg pidgin/pixmaps/emotes/default/22/scalable/rainbow.svg pidgin/pixmaps/emotes/default/22/scalable/rose-dead.svg pidgin/pixmaps/emotes/default/22/scalable/rose.svg pidgin/pixmaps/emotes/default/22/scalable/rotfl.svg pidgin/pixmaps/emotes/default/22/scalable/sad.svg pidgin/pixmaps/emotes/default/22/scalable/sarcastic.svg pidgin/pixmaps/emotes/default/22/scalable/search.svg pidgin/pixmaps/emotes/default/22/scalable/secret.svg pidgin/pixmaps/emotes/default/22/scalable/shame.svg pidgin/pixmaps/emotes/default/22/scalable/sheep.svg pidgin/pixmaps/emotes/default/22/scalable/shock.svg pidgin/pixmaps/emotes/default/22/scalable/shout.svg pidgin/pixmaps/emotes/default/22/scalable/shut-mouth.svg pidgin/pixmaps/emotes/default/22/scalable/sick.svg pidgin/pixmaps/emotes/default/22/scalable/sigarette.svg pidgin/pixmaps/emotes/default/22/scalable/silly.svg pidgin/pixmaps/emotes/default/22/scalable/skeleton.svg pidgin/pixmaps/emotes/default/22/scalable/skywalker.svg pidgin/pixmaps/emotes/default/22/scalable/sleepy.svg pidgin/pixmaps/emotes/default/22/scalable/smile-big.svg pidgin/pixmaps/emotes/default/22/scalable/smile.svg pidgin/pixmaps/emotes/default/22/scalable/smirk.svg pidgin/pixmaps/emotes/default/22/scalable/snail.svg pidgin/pixmaps/emotes/default/22/scalable/snicker.svg pidgin/pixmaps/emotes/default/22/scalable/snowman.svg pidgin/pixmaps/emotes/default/22/scalable/soccerball.svg pidgin/pixmaps/emotes/default/22/scalable/soldier.svg pidgin/pixmaps/emotes/default/22/scalable/star.svg pidgin/pixmaps/emotes/default/22/scalable/starving.svg pidgin/pixmaps/emotes/default/22/scalable/struggle.svg pidgin/pixmaps/emotes/default/22/scalable/sun.svg pidgin/pixmaps/emotes/default/22/scalable/sweat.svg pidgin/pixmaps/emotes/default/22/scalable/teeth.svg pidgin/pixmaps/emotes/default/22/scalable/terror.svg pidgin/pixmaps/emotes/default/22/scalable/thinking.svg pidgin/pixmaps/emotes/default/22/scalable/thunder.svg pidgin/pixmaps/emotes/default/22/scalable/tongue.svg pidgin/pixmaps/emotes/default/22/scalable/tremble.svg pidgin/pixmaps/emotes/default/22/scalable/turtle.svg pidgin/pixmaps/emotes/default/22/scalable/tv.svg pidgin/pixmaps/emotes/default/22/scalable/umbrella.svg pidgin/pixmaps/emotes/default/22/scalable/vampire.svg pidgin/pixmaps/emotes/default/22/scalable/victory.svg pidgin/pixmaps/emotes/default/22/scalable/watermelon.svg pidgin/pixmaps/emotes/default/22/scalable/weep.svg pidgin/pixmaps/emotes/default/22/scalable/wilt.svg pidgin/pixmaps/emotes/default/22/scalable/wink.svg pidgin/pixmaps/emotes/default/22/scalable/yawn.svg pidgin/pixmaps/emotes/default/22/scalable/yin-yang.svg pidgin/pixmaps/emotes/default/22/search.png pidgin/pixmaps/emotes/default/22/secret.png pidgin/pixmaps/emotes/default/22/shame.png pidgin/pixmaps/emotes/default/22/sheep.png pidgin/pixmaps/emotes/default/22/shock.png pidgin/pixmaps/emotes/default/22/shout.png pidgin/pixmaps/emotes/default/22/shut-mouth.png pidgin/pixmaps/emotes/default/22/sick.png pidgin/pixmaps/emotes/default/22/sigarette.png pidgin/pixmaps/emotes/default/22/silly.png pidgin/pixmaps/emotes/default/22/skeleton.png pidgin/pixmaps/emotes/default/22/skywalker.png pidgin/pixmaps/emotes/default/22/sleepy.png pidgin/pixmaps/emotes/default/22/smile-big.png pidgin/pixmaps/emotes/default/22/smile.png pidgin/pixmaps/emotes/default/22/smirk.png pidgin/pixmaps/emotes/default/22/snail.png pidgin/pixmaps/emotes/default/22/snicker.png pidgin/pixmaps/emotes/default/22/snowman.png pidgin/pixmaps/emotes/default/22/soccerball.png pidgin/pixmaps/emotes/default/22/soldier.png pidgin/pixmaps/emotes/default/22/star.png pidgin/pixmaps/emotes/default/22/starving.png pidgin/pixmaps/emotes/default/22/struggle.png pidgin/pixmaps/emotes/default/22/sun.png pidgin/pixmaps/emotes/default/22/sweat.png pidgin/pixmaps/emotes/default/22/teeth.png pidgin/pixmaps/emotes/default/22/terror.png pidgin/pixmaps/emotes/default/22/thinking.png pidgin/pixmaps/emotes/default/22/thunder.png pidgin/pixmaps/emotes/default/22/time-out.png pidgin/pixmaps/emotes/default/22/tongue.png pidgin/pixmaps/emotes/default/22/tremble.png pidgin/pixmaps/emotes/default/22/turtle.png pidgin/pixmaps/emotes/default/22/tv.png pidgin/pixmaps/emotes/default/22/umbrella.png pidgin/pixmaps/emotes/default/22/vampire.png pidgin/pixmaps/emotes/default/22/victory.png pidgin/pixmaps/emotes/default/22/waiting.png pidgin/pixmaps/emotes/default/22/watermelon.png pidgin/pixmaps/emotes/default/22/weep.png pidgin/pixmaps/emotes/default/22/wilt.png pidgin/pixmaps/emotes/default/22/wink.png pidgin/pixmaps/emotes/default/22/worship.png pidgin/pixmaps/emotes/default/22/yawn.png pidgin/pixmaps/emotes/default/22/yin-yang.png pidgin/pixmaps/status/16/message-pending.png pidgin/sounds/Makefile.am pidgin/sounds/Makefile.mingw pidgin/sounds/alert.wav pidgin/sounds/login.wav pidgin/sounds/logout.wav pidgin/sounds/receive.wav pidgin/sounds/send.wav |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/gg/gg.c Tue Aug 14 22:00:24 2007 +0000 +++ b/libpurple/protocols/gg/gg.c Fri Aug 17 01:54:19 2007 +0000 @@ -411,6 +411,8 @@ purple_notify_info(NULL, _("New Gadu-Gadu Account Registered"), _("Registration completed successfully!"), NULL); + if(account->registration_cb) + (account->registration_cb)(account, TRUE, account->registration_cb_user_data); /* TODO: the currently open Accounts Window will not be updated withthe * new username and etc, we need to somehow have it refresh at this * point @@ -420,6 +422,9 @@ purple_connection_destroy(gc); exit_err: + if(account->registration_cb) + (account->registration_cb)(account, FALSE, account->registration_cb_user_data); + gg_register_free(h); g_free(email); g_free(p1);