summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* propagate from branch 'im.pidgin.pidgin' (head ↵cpw.rekkanoryo.icqxstatusMarcus Lundblad2010-02-1884-452/+1672
|\ | | | | | | | | | | 770b86501b614dbcd9bd0d7ebbe55f21446d4dc1) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head ecd37aedbc80e0aa4ad96ee8bde1cf04997f2943)
| * merge of 'fcf9343baf3d0c5890efa917057cd1afbf9023af'Marcus Lundblad2010-02-101-0/+2
| |\ | | | | | | | | | and 'b720353842242458e6c7751cae29e1ac7acac2dc'
| | * merge of 'c27d9bb60878b9a42210b3d1430078d2eb2f4741'Paul Aurich2010-02-091-0/+2
| | |\ | | | | | | | | | | | | and '15d90c7e041b9acae8f318bed077febade5cf4c7'
| | | * disapproval of revision 'db14b022a34677416c5fd208a092d1c99f971e1d'Paul Aurich2010-02-091-0/+2
| | | | | | | | | | | | | | | | Per conversation in devel@cpi, this still needs to be fixed (it sounds like either a bit-packed structure or a bunch of #defines are the leading "solutions")
| * | | jabber: Actually send a mood update when setting a mood status (using the ↵Marcus Lundblad2010-02-101-0/+10
| |/ / | | | | | | | | | generic mood selector).
| * | Show the translated mood message (again), if it matches one of the moods weMarcus Lundblad2010-02-091-2/+16
| | | | | | | | | | | | know about.
| * | Actually set the mood when creating a presence update when receiving mood PEP.Marcus Lundblad2010-02-092-5/+3
| | | | | | | | | | | | Fixed some erronious pixmap references
| * | Some code got duplicated during merge...Marcus Lundblad2010-02-091-2/+0
| | |
| * | Add some missing icons to Makefile.amMarcus Lundblad2010-02-081-0/+5
| | |
| * | Resurrect the PRPL actions to show up in the account submenuMarcus Lundblad2010-02-081-27/+25
| | |
| * | Implemented the get_moods prpl function for XMPP. Enables the generic moodMarcus Lundblad2010-02-084-1/+30
| | | | | | | | | | | | | | | chooser. Doesn't actually work yet...
| * | These icons moved from emblems to emotesMarcus Lundblad2010-02-071-2/+0
| |/
| * Remove the #warning about not enought bits now that OscarCapability is matchedMarcus Lundblad2010-02-071-2/+0
| | | | | | | | with a guint64 in aim_caps in family_locate.c
| * Made it compile again.Marcus Lundblad2010-02-0710-37/+132
| | | | | | | | | | | | Changed aim_info.flag to guint64, to avoid loss of precition, I hope this won't break it... Re-introduced a couple of UI callbacks lost in earlier merges
| * propagate from branch 'im.pidgin.pidgin' (head ↵Marcus Lundblad2010-02-0748-4591/+18527
| |\ | | | | | | | | | | | | | | | 695c6b9a5ff572e57cd53ffc792222b75d92d1b6) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 6a941ac152e3a19ac472c6925f22adb649a7628d)
| * \ propagate from branch 'im.pidgin.pidgin' (head ↵Marcus Lundblad2010-02-0780-456/+1531
| |\ \ | | | | | | | | | | | | | | | | | | | | fa3096fc03d96aab042c6f0c6d678564ba5aba7e) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 1067482b6de1b2d632213dbe877bbeae27d00d0a)
| | * \ propagate from branch 'im.pidgin.pidgin' (head ↵Richard Laager2009-04-0680-319/+1472
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 69f29e0c8111a1c5b6270f7924a468b75f6b5aa9) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 04d4108346e62d0d71e0cc948c824718df4c0004)
| | | * \ Propagated im.pidgin.pidgin to im.pidgin.cpw.rekkanoryo.icqxstatus andRichard Laager2008-12-0150-190/+318
| | | |\ \ | | | | | | | | | | | | | | | | | | merged the smiley theme changes together.
| | | * | | Now that the "Set Mood" UI is in Pidgin, it can do whatever it likes toRichard Laager2008-11-2619-132/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find the right icons. Thus, with a small function and a couple other small changes, I can shuffle all the icons around to eliminate the magic Makefile rules and all the duplicated icons at install-time.
| | | * | | propagate from branch 'im.pidgin.pidgin' (head ↵Richard Laager2008-11-2680-267/+1597
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fff179e5df02a2174c9c1bb2a18f0b5d3e9ed6aa) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head ab5285792516f1877b55d31ad8be158592a0e618)
| | | | * \ \ propagate from branch 'im.pidgin.pidgin' (head ↵Richard Laager2008-11-261-1/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36e86c987b15c8d15fb1424fe253ee342c5ce61b) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head c12dc5973defd5b0f35a3b2397436d9aa41669f6)
| | | | * \ \ \ propagate from branch 'im.pidgin.pidgin' (head ↵Richard Laager2008-11-261-2/+2
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0fbd34db9448873850984bf55f6e82e59a94eeb) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head ebcc2b1a268220323224a03b64f26dfa9a7d96fb)
| | | | * \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head ↵Richard Laager2008-11-266-326/+625
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 699a4dc72c498a84fc691ecbe60f798464a2f8ee) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head e39ef5db1e6ea0923aea9b3d6bda9335bf9c95e0)
| | | | * \ \ \ \ \ merge of '9620af56f3da3d1fff1d5ef2eb03c0992fd9ee66'Richard Laager2008-11-251-0/+3
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and '15238188291ba4664b08d81075b85020cbd91b17'
| | | | | * | | | | | Add minstrel, N3fr0n, and NightFox (respectively) to COPYRIGHT.John Bailey2008-11-251-0/+3
| | | | | | | | | | |
| | | | | * | | | | | propagate from branch 'im.pidgin.pidgin' (head ↵John Bailey2008-11-2529-1293/+1295
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48d838a2e5801782bbc6719b1209e8c932871436) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 9374b413e29099439bfdaf519f9090e4d440b02b)
| | | | * | \ \ \ \ \ \ propagate from branch 'im.pidgin.pidgin' (head ↵Richard Laager2008-11-2530-1294/+1296
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11b0ac96885b5dc211cb21e1c23e768796101712) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 9374b413e29099439bfdaf519f9090e4d440b02b)
| | | | * | | | | | | | Fix up the small theme's Makefile.am for the rename I screwed up.Richard Laager2008-11-171-2/+2
| | | | | | | | | | | |
| | | | * | | | | | | | Smiley changes:Richard Laager2008-11-172-14/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add :'-( as an alias for crying.png in the default set. * Add the XMPP smiley definitions from XEP-0038. I kept the default smileys in XMPP as well. * Add the hidden cyclops smiley from our default set to all of the per-protocol sets. I added all three hidden smileys to the MySpace set. * Rebuild the small.default.in set, after these changes.
| | | | * | | | | | | | Fix a rename that I accidentally did as an add.Richard Laager2008-11-174-0/+0
| | | | | | | | | | | |
| | | | * | | | | | | | propagate from branch 'im.pidgin.pidgin' (head ↵Richard Laager2008-11-1779-251/+1493
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7b485df05f3aec027a4bab8e4e9bbee1ecc1990) to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head d6ac81a4ba31e31e4de5d27cec8a5c87cd96d075)
| | | | | * | | | | | | | Remove some stray debugging printf()s.Richard Laager2008-11-171-13/+2
| | | | | | | | | | | | |
| | | | | * | | | | | | | Convert XMPP to use an array of PurpleMoods internally.Richard Laager2008-11-171-93/+94
| | | | | | | | | | | | |
| | | | | * | | | | | | | Move the mood UI for ICQ into Pidgin. It still uses the new request APIRichard Laager2008-11-1711-191/+300
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stuff, which needs to be replaced. Then it needs to replace the XMPP UI.
| | | | | * | | | | | | | s/savable/saveable/Richard Laager2008-11-171-3/+3
| | | | | | | | | | | | |
| | | | | * | | | | | | | Round three of icon renaming. This is probably all I'm going to do for now.Richard Laager2008-11-1716-24/+36
| | | | | | | | | | | | |
| | | | | * | | | | | | | Round two: Scale down more icons to use as emblems.Richard Laager2008-11-178-0/+27
| | | | | | | | | | | | |
| | | | | * | | | | | | | The first round of renaming icons to match the XEP-0107 names.Richard Laager2008-11-1720-56/+64
| | | | | | | | | | | | |
| | | | | * | | | | | | | Add a PURPLE_STATUS_MOOD primitive and change ICQ to use it.Richard Laager2008-11-1711-155/+254
| | | | | | | | | | | | |
| | | | | * | | | | | | | Look at the mood status attribute on a buddy when picking the emblem.Richard Laager2008-11-161-2/+6
| | | | | | | | | | | | |
| | | | | * | | | | | | | Check that mood is not the empty string, just to be safe.Richard Laager2008-11-161-1/+1
| | | | | | | | | | | | |
| | | | | * | | | | | | | Drop xstatus_ from the icon names.Richard Laager2008-11-161-11/+11
| | | | | | | | | | | | |
| | | | | * | | | | | | | Do not show "Mood: mood ()" when there is no text.Richard Laager2008-11-161-1/+1
| | | | | | | | | | | | |
| | | | | * | | | | | | | Added the additional moods defined in XEP-0107 version 1.2 (2008-10-29):Richard Laager2008-11-161-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://xmpp.org/extensions/xep-0107.html
| | | | | * | | | | | | | Drop xstatus_ from the icon names.Richard Laager2008-11-1612-12/+12
| | | | | | | | | | | | |
| | | | | * | | | | | | | Deprecate purple_request_field_list_add()Richard Laager2008-11-1614-24/+31
| | | | | | | | | | | | |
| | | | | * | | | | | | | Deprecate purple_request_field_list_add() in favor of the newRichard Laager2008-11-162-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | purple_request_field_list_add_icon() which now works whether or not icons are being provided.
| | | | | * | | | | | | | Avoid trying to build a filename and pixbuf if there's no image filename.Richard Laager2008-11-161-5/+8
| | | | | | | | | | | | |
| | | | | * | | | | | | | Use a movie camera icon from N3fr0n instead of the photo camera emoticon toRichard Laager2008-11-164-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more closely match ICQ6. Also, change the description of this icon to "Watching a movie."
| | | | | * | | | | | | | Fix up the X-Status code in many ways:Richard Laager2008-11-168-104/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up the descriptions to be consistently of the form, "I am _____." * Properly mark the descriptions for translation. * Utilize the files from small smiley theme as much as possible. Through a Makefile rule, they will be copied from emotes/small/16/ to emblems/16 at build time and then installed as usual. This is slightly hackish, but ensures that our icons are consistent and saves manual copying work and duplication of source files in the repository. + As part of this, mobile.png was moved to emotes/small/16, as it is needed in both places. * Call these things "Custom Status Icon"s (adding "Status") in the UI. * Add icqmood0 = shopping, based on testing with ICQ6. Thanks John!!! * Change the xstatus_crap icon to xstatus_typing to match ICQ 6. The other typing icon was left alone, except that the name was set to NULL so we wouldn't get duplicates in the list. * Change the xstatus_iron (Pro7 TV icon) to xstatus_suit, using the 'person wearing a suit' icon from N3fr0n to match ICQ6. I named this icon, somewhat arbitrarily, "At the office". * The PDA icon is now the same as the hiptop, but hopefully that won't cause any confusion. Also, the custom icon is now higher priority than the hiptop icon. * The music icon is the ("tune") emblem, not the emoticon. This seems more consistent, given that we're talking about buddy list emblems. * The "Googling" icon has been renamed to "Searching the web" to avoid the trademark. * The "zzz" icon is now an icon for smoking, which seems to fit with the official client's icon as posted in #4508. Other clients may show a marijuana leaf. Oh well.
View Lorry Controller Status