summaryrefslogtreecommitdiff
path: root/protocols/JabberG
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/JabberG')
-rw-r--r--protocols/JabberG/docs/jabberg-translation.txt (renamed from protocols/JabberG/jabberg-translation.txt)0
-rw-r--r--protocols/JabberG/jabber_10.vcxproj218
-rw-r--r--protocols/JabberG/jabber_10.vcxproj.filters326
-rw-r--r--protocols/JabberG/jabber_xstatus/JABBER_XSTATUS.rc198
-rw-r--r--protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj2
-rw-r--r--protocols/JabberG/jabber_xstatus/res/JABBER_XSTATUS.rc198
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/at_the_spa.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/at_the_spa.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/bicycling.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/bicycling.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/brushing_teeth.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/brushing_teeth.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/buying_groceries.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/buying_groceries.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/cleaning.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/cleaning.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/coding.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/coding.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/commuting.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/commuting.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/cooking.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/cooking.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/cycling.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/cycling.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/dancing.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/dancing.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/day_off.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/day_off.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/doing_chores.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/doing_chores.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/doing_maintenance.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/doing_maintenance.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/doing_the_dishes.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/doing_the_dishes.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/doing_the_laundry.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/doing_the_laundry.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/drinking.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/drinking.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/driving.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/driving.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/eating.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/eating.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/exercising.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/exercising.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/fishing.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/fishing.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/gaming.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/gaming.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/gardening.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/gardening.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/getting_a_haircut.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/getting_a_haircut.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/going_out.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/going_out.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/grooming.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/grooming.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/hanging_out.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/hanging_out.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/having_a_beer.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/having_a_beer.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/having_a_snack.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/having_a_snack.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/having_appointment.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/having_appointment.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/having_breakfast.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/having_breakfast.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/having_coffee.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/having_coffee.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/having_dinner.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/having_dinner.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/having_lunch.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/having_lunch.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/having_tea.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/having_tea.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/hiding.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/hiding.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/hiking.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/hiking.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/in_a_car.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/in_a_car.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/in_a_meeting.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/in_a_meeting.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/in_real_life.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/in_real_life.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/inactive.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/inactive.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/jogging.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/jogging.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/on_a_bus.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/on_a_bus.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/on_a_plane.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/on_a_plane.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/on_a_train.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/on_a_train.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/on_a_trip.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/on_a_trip.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/on_the_phone.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/on_the_phone.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/on_vacation.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/on_vacation.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/on_video_phone.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/on_video_phone.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/partying.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/partying.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/playing_sports.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/playing_sports.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/praying.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/praying.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/reading.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/reading.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/rehearsing.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/rehearsing.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/relaxing.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/relaxing.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/running.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/running.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/running_an_errand.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/running_an_errand.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/scheduled_holiday.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/scheduled_holiday.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/shaving.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/shaving.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/shopping.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/shopping.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/skiing.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/skiing.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/sleeping.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/sleeping.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/smoking.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/smoking.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/socializing.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/socializing.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/studying.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/studying.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/sunbathing.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/sunbathing.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/swimming.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/swimming.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/taking_a_bath.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/taking_a_bath.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/taking_a_shower.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/taking_a_shower.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/talking.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/talking.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/thinking.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/thinking.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/traveling.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/traveling.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/walking.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/walking.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/walking_the_dog.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/walking_the_dog.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/watching_a_movie.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/watching_a_movie.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/watching_tv.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/watching_tv.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/working.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/working.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/working_out.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/working_out.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/activities/writing.ico (renamed from protocols/JabberG/jabber_xstatus/icos/activities/writing.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/afraid.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/afraid.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/amazed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/amazed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/amorous.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/amorous.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/angry.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/angry.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/annoyed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/annoyed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/anxious.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/anxious.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/aroused.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/aroused.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/ashamed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/ashamed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/bored.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/bored.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/brave.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/brave.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/calm.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/calm.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/cautious.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/cautious.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/cold.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/cold.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/confident.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/confident.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/confused.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/confused.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/contemplative.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/contemplative.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/contented.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/contented.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/cranky.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/cranky.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/crazy.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/crazy.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/creative.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/creative.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/curious.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/curious.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/dejected.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/dejected.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/depressed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/depressed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/disappointed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/disappointed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/disgusted.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/disgusted.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/dismayed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/dismayed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/distracted.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/distracted.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/embarrassed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/embarrassed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/envious.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/envious.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/excited.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/excited.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/flirtatious.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/flirtatious.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/frustrated.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/frustrated.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/grateful.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/grateful.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/grieving.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/grieving.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/grumpy.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/grumpy.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/guilty.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/guilty.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/happy.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/happy.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/hopeful.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/hopeful.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/hot.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/hot.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/humbled.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/humbled.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/humiliated.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/humiliated.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/hungry.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/hungry.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/hurt.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/hurt.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/impressed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/impressed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/in_awe.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/in_awe.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/in_love.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/in_love.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/indignant.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/indignant.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/interested.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/interested.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/intoxicated.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/intoxicated.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/invincible.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/invincible.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/jealous.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/jealous.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/lonely.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/lonely.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/lost.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/lost.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/lucky.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/lucky.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/mean.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/mean.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/moody.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/moody.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/nervous.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/nervous.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/neutral.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/neutral.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/offended.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/offended.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/outraged.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/outraged.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/playful.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/playful.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/proud.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/proud.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/relaxed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/relaxed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/relieved.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/relieved.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/remorseful.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/remorseful.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/restless.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/restless.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/sad.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/sad.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/sarcastic.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/sarcastic.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/satisfied.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/satisfied.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/serious.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/serious.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/shocked.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/shocked.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/shy.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/shy.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/sick.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/sick.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/sleepy.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/sleepy.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/spontaneous.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/spontaneous.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/stressed.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/stressed.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/strong.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/strong.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/surprised.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/surprised.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/thankful.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/thankful.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/thirsty.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/thirsty.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/tired.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/tired.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/undefined.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/undefined.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/weak.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/weak.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/jabber_xstatus/res/moods/worried.ico (renamed from protocols/JabberG/jabber_xstatus/icos/moods/worried.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj4
-rw-r--r--protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters4
-rw-r--r--protocols/JabberG/proto_jabber/res/Away.ico (renamed from protocols/JabberG/proto_jabber/icos/Away.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/proto_jabber/res/DND.ico (renamed from protocols/JabberG/proto_jabber/icos/DND.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/proto_jabber/res/FFC.ico (renamed from protocols/JabberG/proto_jabber/icos/FFC.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/proto_jabber/res/Invisible.ico (renamed from protocols/JabberG/proto_jabber/icos/Invisible.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/proto_jabber/res/NA.ico (renamed from protocols/JabberG/proto_jabber/icos/NA.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/proto_jabber/res/Offline.ico (renamed from protocols/JabberG/proto_jabber/icos/Offline.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/proto_jabber/res/Online.ico (renamed from protocols/JabberG/proto_jabber/icos/Online.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/proto_jabber/res/Proto_Jabber.rc (renamed from protocols/JabberG/proto_jabber/Proto_Jabber.rc)bin4042 -> 3990 bytes
-rw-r--r--protocols/JabberG/proto_jabber/src/resource.h (renamed from protocols/JabberG/proto_jabber/resource.h)bin1452 -> 1452 bytes
-rw-r--r--protocols/JabberG/res/add2roster.ico (renamed from protocols/JabberG/icos/add2roster.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/addcontact.ico (renamed from protocols/JabberG/icos/addcontact.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/arrow_down.ico (renamed from protocols/JabberG/icos/arrow_down.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/arrow_up.ico (renamed from protocols/JabberG/icos/arrow_up.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/auth_revoke.ico (renamed from protocols/JabberG/icos/auth_revoke.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/bookmarks.ico (renamed from protocols/JabberG/icos/bookmarks.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/res/command.ico (renamed from protocols/JabberG/icos/command.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/console.ico (renamed from protocols/JabberG/icos/console.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/delete.ico (renamed from protocols/JabberG/icos/delete.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/disco_fail.ico (renamed from protocols/JabberG/icos/disco_fail.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/disco_in_progress.ico (renamed from protocols/JabberG/icos/disco_in_progress.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/disco_ok.ico (renamed from protocols/JabberG/icos/disco_ok.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/filter.ico (renamed from protocols/JabberG/icos/filter.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/go.ico (renamed from protocols/JabberG/icos/go.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/grant.ico (renamed from protocols/JabberG/icos/grant.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/group.ico (renamed from protocols/JabberG/icos/group.ico)bin9062 -> 9062 bytes
-rw-r--r--protocols/JabberG/res/home.ico (renamed from protocols/JabberG/icos/home.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/jabber.ico (renamed from protocols/JabberG/icos/jabber.ico)bin6830 -> 6830 bytes
-rw-r--r--protocols/JabberG/res/jabber.rc (renamed from protocols/JabberG/jabber.rc)143
-rw-r--r--protocols/JabberG/res/key.ico (renamed from protocols/JabberG/icos/key.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/login.ico (renamed from protocols/JabberG/icos/login.ico)bin2038 -> 2038 bytes
-rw-r--r--protocols/JabberG/res/message_allow.ico (renamed from protocols/JabberG/icos/message_allow.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/message_deny.ico (renamed from protocols/JabberG/icos/message_deny.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/notes.ico (renamed from protocols/JabberG/icos/notes.ico)bin9062 -> 9062 bytes
-rw-r--r--protocols/JabberG/res/open.ico (renamed from protocols/JabberG/icos/open.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/openid.ico (renamed from protocols/JabberG/icos/openid.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/pages.ico (renamed from protocols/JabberG/icos/pages.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/plist_active.ico (renamed from protocols/JabberG/icos/plist_active.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/plist_any.ico (renamed from protocols/JabberG/icos/plist_any.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/plist_default.ico (renamed from protocols/JabberG/icos/plist_default.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/presence_in_allow.ico (renamed from protocols/JabberG/icos/presence_in_allow.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/presence_in_deny.ico (renamed from protocols/JabberG/icos/presence_in_deny.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/presence_out_allow.ico (renamed from protocols/JabberG/icos/presence_out_allow.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/presence_out_deny.ico (renamed from protocols/JabberG/icos/presence_out_deny.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/privacy_lists.ico (renamed from protocols/JabberG/icos/privacy_lists.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/res/query_allow.ico (renamed from protocols/JabberG/icos/query_allow.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/query_deny.ico (renamed from protocols/JabberG/icos/query_deny.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/refresh.ico (renamed from protocols/JabberG/icos/refresh.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/refresh_node.ico (renamed from protocols/JabberG/icos/refresh_node.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/rename.ico (renamed from protocols/JabberG/icos/rename.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/request.ico (renamed from protocols/JabberG/icos/request.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/reset_filter.ico (renamed from protocols/JabberG/icos/reset_filter.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/roster.ico (renamed from protocols/JabberG/icos/roster.ico)bin5430 -> 5430 bytes
-rw-r--r--protocols/JabberG/res/rss.ico (renamed from protocols/JabberG/icos/rss.ico)bin2038 -> 2038 bytes
-rw-r--r--protocols/JabberG/res/save.ico (renamed from protocols/JabberG/icos/save.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/send_note.ico (renamed from protocols/JabberG/icos/send_note.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/server.ico (renamed from protocols/JabberG/icos/server.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/service_discovery.ico (renamed from protocols/JabberG/icos/service_discovery.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/store.ico (renamed from protocols/JabberG/icos/store.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/transport.ico (renamed from protocols/JabberG/icos/transport.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/transport_local.ico (renamed from protocols/JabberG/icos/transport_local.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/user2room.ico (renamed from protocols/JabberG/icos/user2room.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/version.rc53
-rw-r--r--protocols/JabberG/res/view_as_list.ico (renamed from protocols/JabberG/icos/view_as_list.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/view_as_tree.ico (renamed from protocols/JabberG/icos/view_as_tree.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/res/weather.ico (renamed from protocols/JabberG/icos/weather.ico)bin2550 -> 2550 bytes
-rw-r--r--protocols/JabberG/src/MString.cpp (renamed from protocols/JabberG/MString.cpp)0
-rw-r--r--protocols/JabberG/src/MString.h (renamed from protocols/JabberG/MString.h)0
-rw-r--r--protocols/JabberG/src/jabber.cpp (renamed from protocols/JabberG/jabber.cpp)0
-rw-r--r--protocols/JabberG/src/jabber.h (renamed from protocols/JabberG/jabber.h)0
-rw-r--r--protocols/JabberG/src/jabber_adhoc.cpp (renamed from protocols/JabberG/jabber_adhoc.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_agent.cpp (renamed from protocols/JabberG/jabber_agent.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_bookmarks.cpp (renamed from protocols/JabberG/jabber_bookmarks.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_byte.cpp (renamed from protocols/JabberG/jabber_byte.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_byte.h (renamed from protocols/JabberG/jabber_byte.h)0
-rw-r--r--protocols/JabberG/src/jabber_caps.cpp (renamed from protocols/JabberG/jabber_caps.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_caps.h (renamed from protocols/JabberG/jabber_caps.h)0
-rw-r--r--protocols/JabberG/src/jabber_captcha.cpp (renamed from protocols/JabberG/jabber_captcha.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_chat.cpp (renamed from protocols/JabberG/jabber_chat.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_console.cpp (renamed from protocols/JabberG/jabber_console.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_db_utils.h (renamed from protocols/JabberG/jabber_db_utils.h)0
-rw-r--r--protocols/JabberG/src/jabber_disco.cpp (renamed from protocols/JabberG/jabber_disco.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_disco.h (renamed from protocols/JabberG/jabber_disco.h)0
-rw-r--r--protocols/JabberG/src/jabber_events.cpp (renamed from protocols/JabberG/jabber_events.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_file.cpp (renamed from protocols/JabberG/jabber_file.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_form.cpp (renamed from protocols/JabberG/jabber_form.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_form2.cpp (renamed from protocols/JabberG/jabber_form2.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_form2.h (renamed from protocols/JabberG/jabber_form2.h)0
-rw-r--r--protocols/JabberG/src/jabber_ft.cpp (renamed from protocols/JabberG/jabber_ft.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_groupchat.cpp (renamed from protocols/JabberG/jabber_groupchat.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_ibb.cpp (renamed from protocols/JabberG/jabber_ibb.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_ibb.h (renamed from protocols/JabberG/jabber_ibb.h)0
-rw-r--r--protocols/JabberG/src/jabber_icolib.cpp (renamed from protocols/JabberG/jabber_icolib.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_icolib.h (renamed from protocols/JabberG/jabber_icolib.h)0
-rw-r--r--protocols/JabberG/src/jabber_iq.cpp (renamed from protocols/JabberG/jabber_iq.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_iq.h (renamed from protocols/JabberG/jabber_iq.h)0
-rw-r--r--protocols/JabberG/src/jabber_iq_handlers.cpp (renamed from protocols/JabberG/jabber_iq_handlers.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_iqid.cpp (renamed from protocols/JabberG/jabber_iqid.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_iqid_muc.cpp (renamed from protocols/JabberG/jabber_iqid_muc.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_libstr.cpp (renamed from protocols/JabberG/jabber_libstr.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_list.cpp (renamed from protocols/JabberG/jabber_list.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_list.h (renamed from protocols/JabberG/jabber_list.h)0
-rw-r--r--protocols/JabberG/src/jabber_menu.cpp (renamed from protocols/JabberG/jabber_menu.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_message_handlers.cpp (renamed from protocols/JabberG/jabber_message_handlers.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_message_manager.cpp (renamed from protocols/JabberG/jabber_message_manager.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_message_manager.h (renamed from protocols/JabberG/jabber_message_manager.h)0
-rw-r--r--protocols/JabberG/src/jabber_misc.cpp (renamed from protocols/JabberG/jabber_misc.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_notes.cpp (renamed from protocols/JabberG/jabber_notes.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_notes.h (renamed from protocols/JabberG/jabber_notes.h)0
-rw-r--r--protocols/JabberG/src/jabber_opt.cpp (renamed from protocols/JabberG/jabber_opt.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_opttree.cpp (renamed from protocols/JabberG/jabber_opttree.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_opttree.h (renamed from protocols/JabberG/jabber_opttree.h)0
-rw-r--r--protocols/JabberG/src/jabber_password.cpp (renamed from protocols/JabberG/jabber_password.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_presence_manager.cpp (renamed from protocols/JabberG/jabber_presence_manager.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_presence_manager.h (renamed from protocols/JabberG/jabber_presence_manager.h)0
-rw-r--r--protocols/JabberG/src/jabber_privacy.cpp (renamed from protocols/JabberG/jabber_privacy.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_privacy.h (renamed from protocols/JabberG/jabber_privacy.h)0
-rw-r--r--protocols/JabberG/src/jabber_proto.cpp (renamed from protocols/JabberG/jabber_proto.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_proto.h (renamed from protocols/JabberG/jabber_proto.h)0
-rw-r--r--protocols/JabberG/src/jabber_proxy.cpp (renamed from protocols/JabberG/jabber_proxy.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_proxy.h (renamed from protocols/JabberG/jabber_proxy.h)0
-rw-r--r--protocols/JabberG/src/jabber_rc.cpp (renamed from protocols/JabberG/jabber_rc.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_rc.h (renamed from protocols/JabberG/jabber_rc.h)0
-rw-r--r--protocols/JabberG/src/jabber_search.cpp (renamed from protocols/JabberG/jabber_search.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_search.h (renamed from protocols/JabberG/jabber_search.h)0
-rw-r--r--protocols/JabberG/src/jabber_secur.cpp (renamed from protocols/JabberG/jabber_secur.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_secur.h (renamed from protocols/JabberG/jabber_secur.h)0
-rw-r--r--protocols/JabberG/src/jabber_send_manager.cpp (renamed from protocols/JabberG/jabber_send_manager.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_send_manager.h (renamed from protocols/JabberG/jabber_send_manager.h)0
-rw-r--r--protocols/JabberG/src/jabber_std.cpp (renamed from protocols/JabberG/jabber_std.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_svc.cpp (renamed from protocols/JabberG/jabber_svc.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_thread.cpp (renamed from protocols/JabberG/jabber_thread.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_treelist.cpp (renamed from protocols/JabberG/jabber_treelist.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_userinfo.cpp (renamed from protocols/JabberG/jabber_userinfo.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_util.cpp (renamed from protocols/JabberG/jabber_util.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_vcard.cpp (renamed from protocols/JabberG/jabber_vcard.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_ws.cpp (renamed from protocols/JabberG/jabber_ws.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_xml.cpp (renamed from protocols/JabberG/jabber_xml.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_xml.h (renamed from protocols/JabberG/jabber_xml.h)0
-rw-r--r--protocols/JabberG/src/jabber_xstatus.cpp (renamed from protocols/JabberG/jabber_xstatus.cpp)0
-rw-r--r--protocols/JabberG/src/jabber_xstatus.h (renamed from protocols/JabberG/jabber_xstatus.h)0
-rw-r--r--protocols/JabberG/src/jabber_zstream.cpp (renamed from protocols/JabberG/jabber_zstream.cpp)0
-rw-r--r--protocols/JabberG/src/resource.h (renamed from protocols/JabberG/resource.h)0
-rw-r--r--protocols/JabberG/src/ui_utils.cpp (renamed from protocols/JabberG/ui_utils.cpp)0
-rw-r--r--protocols/JabberG/src/ui_utils.h (renamed from protocols/JabberG/ui_utils.h)0
-rw-r--r--protocols/JabberG/src/version.h (renamed from protocols/JabberG/version.h)0
-rw-r--r--protocols/JabberG/version.rc94
316 files changed, 503 insertions, 737 deletions
diff --git a/protocols/JabberG/jabberg-translation.txt b/protocols/JabberG/docs/jabberg-translation.txt
index 3e58b30b19..3e58b30b19 100644
--- a/protocols/JabberG/jabberg-translation.txt
+++ b/protocols/JabberG/docs/jabberg-translation.txt
diff --git a/protocols/JabberG/jabber_10.vcxproj b/protocols/JabberG/jabber_10.vcxproj
index ae333da2a6..2003650b39 100644
--- a/protocols/JabberG/jabber_10.vcxproj
+++ b/protocols/JabberG/jabber_10.vcxproj
@@ -199,150 +199,92 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="jabber.cpp">
+ <ClCompile Include="src\jabber.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
- <ClCompile Include="jabber_adhoc.cpp" />
- <ClCompile Include="jabber_agent.cpp" />
- <ClCompile Include="jabber_bookmarks.cpp" />
- <ClCompile Include="jabber_byte.cpp" />
- <ClCompile Include="jabber_caps.cpp" />
- <ClCompile Include="jabber_captcha.cpp" />
- <ClCompile Include="jabber_chat.cpp" />
- <ClCompile Include="jabber_console.cpp" />
- <ClCompile Include="jabber_disco.cpp" />
- <ClCompile Include="jabber_events.cpp" />
- <ClCompile Include="jabber_file.cpp" />
- <ClCompile Include="jabber_form.cpp" />
- <ClCompile Include="jabber_ft.cpp" />
- <ClCompile Include="jabber_groupchat.cpp" />
- <ClCompile Include="jabber_ibb.cpp" />
- <ClCompile Include="jabber_icolib.cpp" />
- <ClCompile Include="jabber_iq.cpp" />
- <ClCompile Include="jabber_iq_handlers.cpp" />
- <ClCompile Include="jabber_iqid.cpp" />
- <ClCompile Include="jabber_iqid_muc.cpp" />
- <ClCompile Include="jabber_libstr.cpp" />
- <ClCompile Include="jabber_list.cpp" />
- <ClCompile Include="jabber_menu.cpp" />
- <ClCompile Include="jabber_message_handlers.cpp" />
- <ClCompile Include="jabber_message_manager.cpp" />
- <ClCompile Include="jabber_misc.cpp" />
- <ClCompile Include="jabber_notes.cpp" />
- <ClCompile Include="jabber_opt.cpp" />
- <ClCompile Include="jabber_opttree.cpp" />
- <ClCompile Include="jabber_password.cpp" />
- <ClCompile Include="jabber_presence_manager.cpp" />
- <ClCompile Include="jabber_privacy.cpp" />
- <ClCompile Include="jabber_proto.cpp" />
- <ClCompile Include="jabber_proxy.cpp" />
- <ClCompile Include="jabber_rc.cpp" />
- <ClCompile Include="jabber_search.cpp" />
- <ClCompile Include="jabber_secur.cpp" />
- <ClCompile Include="jabber_send_manager.cpp" />
- <ClCompile Include="jabber_std.cpp" />
- <ClCompile Include="jabber_svc.cpp" />
- <ClCompile Include="jabber_thread.cpp" />
- <ClCompile Include="jabber_treelist.cpp" />
- <ClCompile Include="jabber_userinfo.cpp" />
- <ClCompile Include="jabber_util.cpp" />
- <ClCompile Include="jabber_vcard.cpp" />
- <ClCompile Include="jabber_ws.cpp" />
- <ClCompile Include="jabber_xml.cpp" />
- <ClCompile Include="jabber_xstatus.cpp" />
- <ClCompile Include="jabber_zstream.cpp" />
- <ClCompile Include="MString.cpp" />
- <ClCompile Include="ui_utils.cpp" />
+ <ClCompile Include="src\jabber_adhoc.cpp" />
+ <ClCompile Include="src\jabber_agent.cpp" />
+ <ClCompile Include="src\jabber_bookmarks.cpp" />
+ <ClCompile Include="src\jabber_byte.cpp" />
+ <ClCompile Include="src\jabber_caps.cpp" />
+ <ClCompile Include="src\jabber_captcha.cpp" />
+ <ClCompile Include="src\jabber_chat.cpp" />
+ <ClCompile Include="src\jabber_console.cpp" />
+ <ClCompile Include="src\jabber_disco.cpp" />
+ <ClCompile Include="src\jabber_events.cpp" />
+ <ClCompile Include="src\jabber_file.cpp" />
+ <ClCompile Include="src\jabber_form.cpp" />
+ <ClCompile Include="src\jabber_ft.cpp" />
+ <ClCompile Include="src\jabber_groupchat.cpp" />
+ <ClCompile Include="src\jabber_ibb.cpp" />
+ <ClCompile Include="src\jabber_icolib.cpp" />
+ <ClCompile Include="src\jabber_iq.cpp" />
+ <ClCompile Include="src\jabber_iq_handlers.cpp" />
+ <ClCompile Include="src\jabber_iqid.cpp" />
+ <ClCompile Include="src\jabber_iqid_muc.cpp" />
+ <ClCompile Include="src\jabber_libstr.cpp" />
+ <ClCompile Include="src\jabber_list.cpp" />
+ <ClCompile Include="src\jabber_menu.cpp" />
+ <ClCompile Include="src\jabber_message_handlers.cpp" />
+ <ClCompile Include="src\jabber_message_manager.cpp" />
+ <ClCompile Include="src\jabber_misc.cpp" />
+ <ClCompile Include="src\jabber_notes.cpp" />
+ <ClCompile Include="src\jabber_opt.cpp" />
+ <ClCompile Include="src\jabber_opttree.cpp" />
+ <ClCompile Include="src\jabber_password.cpp" />
+ <ClCompile Include="src\jabber_presence_manager.cpp" />
+ <ClCompile Include="src\jabber_privacy.cpp" />
+ <ClCompile Include="src\jabber_proto.cpp" />
+ <ClCompile Include="src\jabber_proxy.cpp" />
+ <ClCompile Include="src\jabber_rc.cpp" />
+ <ClCompile Include="src\jabber_search.cpp" />
+ <ClCompile Include="src\jabber_secur.cpp" />
+ <ClCompile Include="src\jabber_send_manager.cpp" />
+ <ClCompile Include="src\jabber_std.cpp" />
+ <ClCompile Include="src\jabber_svc.cpp" />
+ <ClCompile Include="src\jabber_thread.cpp" />
+ <ClCompile Include="src\jabber_treelist.cpp" />
+ <ClCompile Include="src\jabber_userinfo.cpp" />
+ <ClCompile Include="src\jabber_util.cpp" />
+ <ClCompile Include="src\jabber_vcard.cpp" />
+ <ClCompile Include="src\jabber_ws.cpp" />
+ <ClCompile Include="src\jabber_xml.cpp" />
+ <ClCompile Include="src\jabber_xstatus.cpp" />
+ <ClCompile Include="src\jabber_zstream.cpp" />
+ <ClCompile Include="src\MString.cpp" />
+ <ClCompile Include="src\ui_utils.cpp" />
</ItemGroup>
<ItemGroup>
- <ClInclude Include="jabber.h" />
- <ClInclude Include="jabber_byte.h" />
- <ClInclude Include="jabber_caps.h" />
- <ClInclude Include="jabber_db_utils.h" />
- <ClInclude Include="jabber_disco.h" />
- <ClInclude Include="jabber_ibb.h" />
- <ClInclude Include="jabber_icolib.h" />
- <ClInclude Include="jabber_iq.h" />
- <ClInclude Include="jabber_list.h" />
- <ClInclude Include="jabber_message_manager.h" />
- <ClInclude Include="jabber_notes.h" />
- <ClInclude Include="jabber_opttree.h" />
- <ClInclude Include="jabber_presence_manager.h" />
- <ClInclude Include="jabber_privacy.h" />
- <ClInclude Include="jabber_proto.h" />
- <ClInclude Include="jabber_proxy.h" />
- <ClInclude Include="jabber_rc.h" />
- <ClInclude Include="jabber_search.h" />
- <ClInclude Include="jabber_secur.h" />
- <ClInclude Include="jabber_send_manager.h" />
- <ClInclude Include="jabber_xml.h" />
- <ClInclude Include="jabber_xstatus.h" />
- <ClInclude Include="MString.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="ui_utils.h" />
- <ClInclude Include="version.h" />
+ <ClInclude Include="src\jabber.h" />
+ <ClInclude Include="src\jabber_byte.h" />
+ <ClInclude Include="src\jabber_caps.h" />
+ <ClInclude Include="src\jabber_db_utils.h" />
+ <ClInclude Include="src\jabber_disco.h" />
+ <ClInclude Include="src\jabber_ibb.h" />
+ <ClInclude Include="src\jabber_icolib.h" />
+ <ClInclude Include="src\jabber_iq.h" />
+ <ClInclude Include="src\jabber_list.h" />
+ <ClInclude Include="src\jabber_message_manager.h" />
+ <ClInclude Include="src\jabber_notes.h" />
+ <ClInclude Include="src\jabber_opttree.h" />
+ <ClInclude Include="src\jabber_presence_manager.h" />
+ <ClInclude Include="src\jabber_privacy.h" />
+ <ClInclude Include="src\jabber_proto.h" />
+ <ClInclude Include="src\jabber_proxy.h" />
+ <ClInclude Include="src\jabber_rc.h" />
+ <ClInclude Include="src\jabber_search.h" />
+ <ClInclude Include="src\jabber_secur.h" />
+ <ClInclude Include="src\jabber_send_manager.h" />
+ <ClInclude Include="src\jabber_xml.h" />
+ <ClInclude Include="src\jabber_xstatus.h" />
+ <ClInclude Include="src\MString.h" />
+ <ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\ui_utils.h" />
+ <ClInclude Include="src\version.h" />
</ItemGroup>
<ItemGroup>
- <None Include="icos\add2roster.ico" />
- <None Include="icos\addcontact.ico" />
- <None Include="icos\arrow_down.ico" />
- <None Include="icos\arrow_up.ico" />
- <None Include="icos\auth_revoke.ico" />
- <None Include="icos\bookmarks.ico" />
- <None Include="icos\command.ico" />
- <None Include="icos\console.ico" />
- <None Include="icos\delete.ico" />
- <None Include="icos\disco_fail.ico" />
- <None Include="icos\disco_in_progress.ico" />
- <None Include="icos\disco_ok.ico" />
- <None Include="icos\filter.ico" />
- <None Include="icos\go.ico" />
- <None Include="icos\grant.ico" />
- <None Include="icos\group.ico" />
- <None Include="icos\home.ico" />
- <None Include="icos\jabber.ico" />
- <None Include="icos\key.ico" />
- <None Include="icos\login.ico" />
- <None Include="icos\message_allow.ico" />
- <None Include="icos\message_deny.ico" />
- <None Include="icos\notes.ico" />
- <None Include="icos\open.ico" />
- <None Include="icos\openid.ico" />
- <None Include="icos\pages.ico" />
- <None Include="icos\plist_active.ico" />
- <None Include="icos\plist_any.ico" />
- <None Include="icos\plist_default.ico" />
- <None Include="icos\presence_in_allow.ico" />
- <None Include="icos\presence_in_deny.ico" />
- <None Include="icos\presence_out_allow.ico" />
- <None Include="icos\presence_out_deny.ico" />
- <None Include="icos\privacy_lists.ico" />
- <None Include="icos\query_allow.ico" />
- <None Include="icos\query_deny.ico" />
- <None Include="icos\refresh.ico" />
- <None Include="icos\refresh_node.ico" />
- <None Include="icos\rename.ico" />
- <None Include="icos\request.ico" />
- <None Include="icos\reset_filter.ico" />
- <None Include="icos\roster.ico" />
- <None Include="icos\rss.ico" />
- <None Include="icos\save.ico" />
- <None Include="icos\send_note.ico" />
- <None Include="icos\server.ico" />
- <None Include="icos\service_discovery.ico" />
- <None Include="icos\store.ico" />
- <None Include="icos\transport.ico" />
- <None Include="icos\transport_local.ico" />
- <None Include="icos\user2room.ico" />
- <None Include="icos\view_as_list.ico" />
- <None Include="icos\view_as_tree.ico" />
- <None Include="icos\weather.ico" />
- <None Include="docs\changelog_jabber.txt" />
- <None Include="docs\readme_jabber.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="jabber.rc" />
- <ResourceCompile Include="version.rc" />
+ <ResourceCompile Include="res\jabber.rc" />
+ <ResourceCompile Include="res\version.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\plugins\zlib\zlib_10.vcxproj">
diff --git a/protocols/JabberG/jabber_10.vcxproj.filters b/protocols/JabberG/jabber_10.vcxproj.filters
index e5d93e91ba..d671a671c9 100644
--- a/protocols/JabberG/jabber_10.vcxproj.filters
+++ b/protocols/JabberG/jabber_10.vcxproj.filters
@@ -15,414 +15,248 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="jabber.cpp">
+ <ClCompile Include="src\jabber.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_adhoc.cpp">
+ <ClCompile Include="src\jabber_adhoc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_agent.cpp">
+ <ClCompile Include="src\jabber_agent.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_bookmarks.cpp">
+ <ClCompile Include="src\jabber_bookmarks.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_byte.cpp">
+ <ClCompile Include="src\jabber_byte.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_caps.cpp">
+ <ClCompile Include="src\jabber_caps.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_chat.cpp">
+ <ClCompile Include="src\jabber_chat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_console.cpp">
+ <ClCompile Include="src\jabber_console.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_disco.cpp">
+ <ClCompile Include="src\jabber_disco.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_events.cpp">
+ <ClCompile Include="src\jabber_events.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_file.cpp">
+ <ClCompile Include="src\jabber_file.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_form.cpp">
+ <ClCompile Include="src\jabber_form.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_ft.cpp">
+ <ClCompile Include="src\jabber_ft.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_groupchat.cpp">
+ <ClCompile Include="src\jabber_groupchat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_ibb.cpp">
+ <ClCompile Include="src\jabber_ibb.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_icolib.cpp">
+ <ClCompile Include="src\jabber_icolib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_iq.cpp">
+ <ClCompile Include="src\jabber_iq.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_iq_handlers.cpp">
+ <ClCompile Include="src\jabber_iq_handlers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_iqid.cpp">
+ <ClCompile Include="src\jabber_iqid.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_iqid_muc.cpp">
+ <ClCompile Include="src\jabber_iqid_muc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_libstr.cpp">
+ <ClCompile Include="src\jabber_libstr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_list.cpp">
+ <ClCompile Include="src\jabber_list.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_menu.cpp">
+ <ClCompile Include="src\jabber_menu.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_message_handlers.cpp">
+ <ClCompile Include="src\jabber_message_handlers.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_message_manager.cpp">
+ <ClCompile Include="src\jabber_message_manager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_misc.cpp">
+ <ClCompile Include="src\jabber_misc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_notes.cpp">
+ <ClCompile Include="src\jabber_notes.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_opt.cpp">
+ <ClCompile Include="src\jabber_opt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_opttree.cpp">
+ <ClCompile Include="src\jabber_opttree.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_password.cpp">
+ <ClCompile Include="src\jabber_password.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_presence_manager.cpp">
+ <ClCompile Include="src\jabber_presence_manager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_privacy.cpp">
+ <ClCompile Include="src\jabber_privacy.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_proto.cpp">
+ <ClCompile Include="src\jabber_proto.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_proxy.cpp">
+ <ClCompile Include="src\jabber_proxy.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_rc.cpp">
+ <ClCompile Include="src\jabber_rc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_search.cpp">
+ <ClCompile Include="src\jabber_search.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_secur.cpp">
+ <ClCompile Include="src\jabber_secur.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_send_manager.cpp">
+ <ClCompile Include="src\jabber_send_manager.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_std.cpp">
+ <ClCompile Include="src\jabber_std.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_svc.cpp">
+ <ClCompile Include="src\jabber_svc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_thread.cpp">
+ <ClCompile Include="src\jabber_thread.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_treelist.cpp">
+ <ClCompile Include="src\jabber_treelist.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_userinfo.cpp">
+ <ClCompile Include="src\jabber_userinfo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_util.cpp">
+ <ClCompile Include="src\jabber_util.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_vcard.cpp">
+ <ClCompile Include="src\jabber_vcard.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_ws.cpp">
+ <ClCompile Include="src\jabber_ws.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_xml.cpp">
+ <ClCompile Include="src\jabber_xml.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_xstatus.cpp">
+ <ClCompile Include="src\jabber_xstatus.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_zstream.cpp">
+ <ClCompile Include="src\jabber_zstream.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="MString.cpp">
+ <ClCompile Include="src\MString.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="ui_utils.cpp">
+ <ClCompile Include="src\ui_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="jabber_captcha.cpp">
+ <ClCompile Include="src\jabber_captcha.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="jabber.h">
+ <ClInclude Include="src\jabber.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_byte.h">
+ <ClInclude Include="src\jabber_byte.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_caps.h">
+ <ClInclude Include="src\jabber_caps.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_disco.h">
+ <ClInclude Include="src\jabber_disco.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_ibb.h">
+ <ClInclude Include="src\jabber_ibb.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_iq.h">
+ <ClInclude Include="src\jabber_iq.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_list.h">
+ <ClInclude Include="src\jabber_list.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_message_manager.h">
+ <ClInclude Include="src\jabber_message_manager.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_notes.h">
+ <ClInclude Include="src\jabber_notes.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_opttree.h">
+ <ClInclude Include="src\jabber_opttree.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_presence_manager.h">
+ <ClInclude Include="src\jabber_presence_manager.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_privacy.h">
+ <ClInclude Include="src\jabber_privacy.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_proto.h">
+ <ClInclude Include="src\jabber_proto.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_proxy.h">
+ <ClInclude Include="src\jabber_proxy.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_rc.h">
+ <ClInclude Include="src\jabber_rc.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_search.h">
+ <ClInclude Include="src\jabber_search.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_secur.h">
+ <ClInclude Include="src\jabber_secur.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_send_manager.h">
+ <ClInclude Include="src\jabber_send_manager.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_xml.h">
+ <ClInclude Include="src\jabber_xml.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="MString.h">
+ <ClInclude Include="src\MString.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="ui_utils.h">
+ <ClInclude Include="src\ui_utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="version.h">
+ <ClInclude Include="src\version.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_db_utils.h">
+ <ClInclude Include="src\jabber_db_utils.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_icolib.h">
+ <ClInclude Include="src\jabber_icolib.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="jabber_xstatus.h">
+ <ClInclude Include="src\jabber_xstatus.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <None Include="icos\add2roster.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\addcontact.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\arrow_down.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\arrow_up.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\auth_revoke.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\bookmarks.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\command.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\console.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\delete.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\disco_fail.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\disco_in_progress.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\disco_ok.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\filter.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\go.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\grant.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\group.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\home.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\jabber.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\key.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\login.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\message_allow.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\message_deny.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\notes.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\open.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\openid.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\pages.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\plist_active.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\plist_any.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\plist_default.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\presence_in_allow.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\presence_in_deny.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\presence_out_allow.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\presence_out_deny.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\privacy_lists.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\query_allow.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\query_deny.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\refresh.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\refresh_node.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\rename.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\request.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\reset_filter.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\roster.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\rss.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\save.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\send_note.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\server.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\service_discovery.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\store.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\transport.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\transport_local.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\user2room.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\view_as_list.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\view_as_tree.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="icos\weather.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="docs\changelog_jabber.txt" />
- <None Include="docs\readme_jabber.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="jabber.rc">
+ <ResourceCompile Include="res\jabber.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="version.rc">
+ <ResourceCompile Include="res\version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS.rc b/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS.rc
deleted file mode 100644
index 9497ab6117..0000000000
--- a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS.rc
+++ /dev/null
@@ -1,198 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-201 ICON DISCARDABLE "icos/moods/afraid.ico"
-202 ICON DISCARDABLE "icos/moods/amazed.ico"
-203 ICON DISCARDABLE "icos/moods/amorous.ico"
-204 ICON DISCARDABLE "icos/moods/angry.ico"
-205 ICON DISCARDABLE "icos/moods/annoyed.ico"
-206 ICON DISCARDABLE "icos/moods/anxious.ico"
-207 ICON DISCARDABLE "icos/moods/aroused.ico"
-208 ICON DISCARDABLE "icos/moods/ashamed.ico"
-209 ICON DISCARDABLE "icos/moods/bored.ico"
-210 ICON DISCARDABLE "icos/moods/brave.ico"
-211 ICON DISCARDABLE "icos/moods/calm.ico"
-212 ICON DISCARDABLE "icos/moods/cautious.ico"
-213 ICON DISCARDABLE "icos/moods/cold.ico"
-214 ICON DISCARDABLE "icos/moods/confident.ico"
-215 ICON DISCARDABLE "icos/moods/confused.ico"
-216 ICON DISCARDABLE "icos/moods/contemplative.ico"
-217 ICON DISCARDABLE "icos/moods/contented.ico"
-218 ICON DISCARDABLE "icos/moods/cranky.ico"
-219 ICON DISCARDABLE "icos/moods/crazy.ico"
-220 ICON DISCARDABLE "icos/moods/creative.ico"
-221 ICON DISCARDABLE "icos/moods/curious.ico"
-222 ICON DISCARDABLE "icos/moods/dejected.ico"
-223 ICON DISCARDABLE "icos/moods/depressed.ico"
-224 ICON DISCARDABLE "icos/moods/disappointed.ico"
-225 ICON DISCARDABLE "icos/moods/disgusted.ico"
-226 ICON DISCARDABLE "icos/moods/dismayed.ico"
-227 ICON DISCARDABLE "icos/moods/distracted.ico"
-228 ICON DISCARDABLE "icos/moods/embarrassed.ico"
-229 ICON DISCARDABLE "icos/moods/envious.ico"
-230 ICON DISCARDABLE "icos/moods/excited.ico"
-231 ICON DISCARDABLE "icos/moods/flirtatious.ico"
-232 ICON DISCARDABLE "icos/moods/frustrated.ico"
-233 ICON DISCARDABLE "icos/moods/grateful.ico"
-234 ICON DISCARDABLE "icos/moods/grieving.ico"
-235 ICON DISCARDABLE "icos/moods/grumpy.ico"
-236 ICON DISCARDABLE "icos/moods/guilty.ico"
-237 ICON DISCARDABLE "icos/moods/happy.ico"
-238 ICON DISCARDABLE "icos/moods/hopeful.ico"
-239 ICON DISCARDABLE "icos/moods/hot.ico"
-240 ICON DISCARDABLE "icos/moods/humbled.ico"
-241 ICON DISCARDABLE "icos/moods/humiliated.ico"
-242 ICON DISCARDABLE "icos/moods/hungry.ico"
-243 ICON DISCARDABLE "icos/moods/hurt.ico"
-244 ICON DISCARDABLE "icos/moods/impressed.ico"
-245 ICON DISCARDABLE "icos/moods/in_awe.ico"
-246 ICON DISCARDABLE "icos/moods/in_love.ico"
-247 ICON DISCARDABLE "icos/moods/indignant.ico"
-248 ICON DISCARDABLE "icos/moods/interested.ico"
-249 ICON DISCARDABLE "icos/moods/intoxicated.ico"
-250 ICON DISCARDABLE "icos/moods/invincible.ico"
-251 ICON DISCARDABLE "icos/moods/jealous.ico"
-252 ICON DISCARDABLE "icos/moods/lonely.ico"
-253 ICON DISCARDABLE "icos/moods/lost.ico"
-254 ICON DISCARDABLE "icos/moods/lucky.ico"
-255 ICON DISCARDABLE "icos/moods/mean.ico"
-256 ICON DISCARDABLE "icos/moods/moody.ico"
-257 ICON DISCARDABLE "icos/moods/nervous.ico"
-258 ICON DISCARDABLE "icos/moods/neutral.ico"
-259 ICON DISCARDABLE "icos/moods/offended.ico"
-260 ICON DISCARDABLE "icos/moods/outraged.ico"
-261 ICON DISCARDABLE "icos/moods/playful.ico"
-262 ICON DISCARDABLE "icos/moods/proud.ico"
-263 ICON DISCARDABLE "icos/moods/relaxed.ico"
-264 ICON DISCARDABLE "icos/moods/relieved.ico"
-265 ICON DISCARDABLE "icos/moods/remorseful.ico"
-266 ICON DISCARDABLE "icos/moods/restless.ico"
-267 ICON DISCARDABLE "icos/moods/sad.ico"
-268 ICON DISCARDABLE "icos/moods/sarcastic.ico"
-269 ICON DISCARDABLE "icos/moods/satisfied.ico"
-270 ICON DISCARDABLE "icos/moods/serious.ico"
-271 ICON DISCARDABLE "icos/moods/shocked.ico"
-272 ICON DISCARDABLE "icos/moods/shy.ico"
-273 ICON DISCARDABLE "icos/moods/sick.ico"
-274 ICON DISCARDABLE "icos/moods/sleepy.ico"
-275 ICON DISCARDABLE "icos/moods/spontaneous.ico"
-276 ICON DISCARDABLE "icos/moods/stressed.ico"
-277 ICON DISCARDABLE "icos/moods/strong.ico"
-278 ICON DISCARDABLE "icos/moods/surprised.ico"
-279 ICON DISCARDABLE "icos/moods/thankful.ico"
-280 ICON DISCARDABLE "icos/moods/thirsty.ico"
-281 ICON DISCARDABLE "icos/moods/tired.ico"
-282 ICON DISCARDABLE "icos/moods/undefined.ico"
-283 ICON DISCARDABLE "icos/moods/weak.ico"
-284 ICON DISCARDABLE "icos/moods/worried.ico"
-
-
-300 ICON DISCARDABLE "icos/activities/doing_chores.ico"
-301 ICON DISCARDABLE "icos/activities/buying_groceries.ico"
-302 ICON DISCARDABLE "icos/activities/cleaning.ico"
-303 ICON DISCARDABLE "icos/activities/cooking.ico"
-304 ICON DISCARDABLE "icos/activities/doing_maintenance.ico"
-305 ICON DISCARDABLE "icos/activities/doing_the_dishes.ico"
-306 ICON DISCARDABLE "icos/activities/doing_the_laundry.ico"
-307 ICON DISCARDABLE "icos/activities/gardening.ico"
-308 ICON DISCARDABLE "icos/activities/running_an_errand.ico"
-309 ICON DISCARDABLE "icos/activities/walking_the_dog.ico"
-320 ICON DISCARDABLE "icos/activities/drinking.ico"
-321 ICON DISCARDABLE "icos/activities/having_a_beer.ico"
-322 ICON DISCARDABLE "icos/activities/having_coffee.ico"
-323 ICON DISCARDABLE "icos/activities/having_tea.ico"
-340 ICON DISCARDABLE "icos/activities/eating.ico"
-341 ICON DISCARDABLE "icos/activities/having_a_snack.ico"
-342 ICON DISCARDABLE "icos/activities/having_breakfast.ico"
-343 ICON DISCARDABLE "icos/activities/having_dinner.ico"
-344 ICON DISCARDABLE "icos/activities/having_lunch.ico"
-360 ICON DISCARDABLE "icos/activities/exercising.ico"
-361 ICON DISCARDABLE "icos/activities/cycling.ico"
-362 ICON DISCARDABLE "icos/activities/dancing.ico"
-363 ICON DISCARDABLE "icos/activities/hiking.ico"
-364 ICON DISCARDABLE "icos/activities/jogging.ico"
-365 ICON DISCARDABLE "icos/activities/playing_sports.ico"
-366 ICON DISCARDABLE "icos/activities/running.ico"
-367 ICON DISCARDABLE "icos/activities/skiing.ico"
-368 ICON DISCARDABLE "icos/activities/swimming.ico"
-369 ICON DISCARDABLE "icos/activities/working_out.ico"
-380 ICON DISCARDABLE "icos/activities/grooming.ico"
-381 ICON DISCARDABLE "icos/activities/at_the_spa.ico"
-382 ICON DISCARDABLE "icos/activities/brushing_teeth.ico"
-383 ICON DISCARDABLE "icos/activities/getting_a_haircut.ico"
-384 ICON DISCARDABLE "icos/activities/shaving.ico"
-385 ICON DISCARDABLE "icos/activities/taking_a_bath.ico"
-386 ICON DISCARDABLE "icos/activities/taking_a_shower.ico"
-400 ICON DISCARDABLE "icos/activities/having_appointment.ico"
-420 ICON DISCARDABLE "icos/activities/inactive.ico"
-421 ICON DISCARDABLE "icos/activities/day_off.ico"
-422 ICON DISCARDABLE "icos/activities/hanging_out.ico"
-423 ICON DISCARDABLE "icos/activities/hiding.ico"
-424 ICON DISCARDABLE "icos/activities/on_vacation.ico"
-425 ICON DISCARDABLE "icos/activities/praying.ico"
-426 ICON DISCARDABLE "icos/activities/scheduled_holiday.ico"
-427 ICON DISCARDABLE "icos/activities/sleeping.ico"
-428 ICON DISCARDABLE "icos/activities/thinking.ico"
-440 ICON DISCARDABLE "icos/activities/relaxing.ico"
-441 ICON DISCARDABLE "icos/activities/fishing.ico"
-442 ICON DISCARDABLE "icos/activities/gaming.ico"
-443 ICON DISCARDABLE "icos/activities/going_out.ico"
-444 ICON DISCARDABLE "icos/activities/partying.ico"
-445 ICON DISCARDABLE "icos/activities/reading.ico"
-446 ICON DISCARDABLE "icos/activities/rehearsing.ico"
-447 ICON DISCARDABLE "icos/activities/shopping.ico"
-448 ICON DISCARDABLE "icos/activities/smoking.ico"
-449 ICON DISCARDABLE "icos/activities/socializing.ico"
-450 ICON DISCARDABLE "icos/activities/sunbathing.ico"
-451 ICON DISCARDABLE "icos/activities/watching_tv.ico"
-452 ICON DISCARDABLE "icos/activities/watching_a_movie.ico"
-460 ICON DISCARDABLE "icos/activities/talking.ico"
-461 ICON DISCARDABLE "icos/activities/in_real_life.ico"
-462 ICON DISCARDABLE "icos/activities/on_the_phone.ico"
-463 ICON DISCARDABLE "icos/activities/on_video_phone.ico"
-480 ICON DISCARDABLE "icos/activities/traveling.ico"
-481 ICON DISCARDABLE "icos/activities/commuting.ico"
-482 ICON DISCARDABLE "icos/activities/cycling.ico"
-483 ICON DISCARDABLE "icos/activities/driving.ico"
-484 ICON DISCARDABLE "icos/activities/in_a_car.ico"
-485 ICON DISCARDABLE "icos/activities/on_a_bus.ico"
-486 ICON DISCARDABLE "icos/activities/on_a_plane.ico"
-487 ICON DISCARDABLE "icos/activities/on_a_train.ico"
-488 ICON DISCARDABLE "icos/activities/on_a_trip.ico"
-489 ICON DISCARDABLE "icos/activities/walking.ico"
-500 ICON DISCARDABLE "icos/activities/working.ico"
-501 ICON DISCARDABLE "icos/activities/coding.ico"
-502 ICON DISCARDABLE "icos/activities/in_a_meeting.ico"
-503 ICON DISCARDABLE "icos/activities/studying.ico"
-504 ICON DISCARDABLE "icos/activities/writing.ico"
-
-
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
diff --git a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj b/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj
index 5a4d9ff785..0f52450e72 100644
--- a/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj
+++ b/protocols/JabberG/jabber_xstatus/JABBER_XSTATUS_10.vcxproj
@@ -120,7 +120,7 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ResourceCompile Include="JABBER_XSTATUS.rc" />
+ <ResourceCompile Include="res\JABBER_XSTATUS.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/protocols/JabberG/jabber_xstatus/res/JABBER_XSTATUS.rc b/protocols/JabberG/jabber_xstatus/res/JABBER_XSTATUS.rc
new file mode 100644
index 0000000000..40eb3e2084
--- /dev/null
+++ b/protocols/JabberG/jabber_xstatus/res/JABBER_XSTATUS.rc
@@ -0,0 +1,198 @@
+//Microsoft Developer Studio generated resource script.
+//
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+201 ICON "moods/afraid.ico"
+202 ICON "moods/amazed.ico"
+203 ICON "moods/amorous.ico"
+204 ICON "moods/angry.ico"
+205 ICON "moods/annoyed.ico"
+206 ICON "moods/anxious.ico"
+207 ICON "moods/aroused.ico"
+208 ICON "moods/ashamed.ico"
+209 ICON "moods/bored.ico"
+210 ICON "moods/brave.ico"
+211 ICON "moods/calm.ico"
+212 ICON "moods/cautious.ico"
+213 ICON "moods/cold.ico"
+214 ICON "moods/confident.ico"
+215 ICON "moods/confused.ico"
+216 ICON "moods/contemplative.ico"
+217 ICON "moods/contented.ico"
+218 ICON "moods/cranky.ico"
+219 ICON "moods/crazy.ico"
+220 ICON "moods/creative.ico"
+221 ICON "moods/curious.ico"
+222 ICON "moods/dejected.ico"
+223 ICON "moods/depressed.ico"
+224 ICON "moods/disappointed.ico"
+225 ICON "moods/disgusted.ico"
+226 ICON "moods/dismayed.ico"
+227 ICON "moods/distracted.ico"
+228 ICON "moods/embarrassed.ico"
+229 ICON "moods/envious.ico"
+230 ICON "moods/excited.ico"
+231 ICON "moods/flirtatious.ico"
+232 ICON "moods/frustrated.ico"
+233 ICON "moods/grateful.ico"
+234 ICON "moods/grieving.ico"
+235 ICON "moods/grumpy.ico"
+236 ICON "moods/guilty.ico"
+237 ICON "moods/happy.ico"
+238 ICON "moods/hopeful.ico"
+239 ICON "moods/hot.ico"
+240 ICON "moods/humbled.ico"
+241 ICON "moods/humiliated.ico"
+242 ICON "moods/hungry.ico"
+243 ICON "moods/hurt.ico"
+244 ICON "moods/impressed.ico"
+245 ICON "moods/in_awe.ico"
+246 ICON "moods/in_love.ico"
+247 ICON "moods/indignant.ico"
+248 ICON "moods/interested.ico"
+249 ICON "moods/intoxicated.ico"
+250 ICON "moods/invincible.ico"
+251 ICON "moods/jealous.ico"
+252 ICON "moods/lonely.ico"
+253 ICON "moods/lost.ico"
+254 ICON "moods/lucky.ico"
+255 ICON "moods/mean.ico"
+256 ICON "moods/moody.ico"
+257 ICON "moods/nervous.ico"
+258 ICON "moods/neutral.ico"
+259 ICON "moods/offended.ico"
+260 ICON "moods/outraged.ico"
+261 ICON "moods/playful.ico"
+262 ICON "moods/proud.ico"
+263 ICON "moods/relaxed.ico"
+264 ICON "moods/relieved.ico"
+265 ICON "moods/remorseful.ico"
+266 ICON "moods/restless.ico"
+267 ICON "moods/sad.ico"
+268 ICON "moods/sarcastic.ico"
+269 ICON "moods/satisfied.ico"
+270 ICON "moods/serious.ico"
+271 ICON "moods/shocked.ico"
+272 ICON "moods/shy.ico"
+273 ICON "moods/sick.ico"
+274 ICON "moods/sleepy.ico"
+275 ICON "moods/spontaneous.ico"
+276 ICON "moods/stressed.ico"
+277 ICON "moods/strong.ico"
+278 ICON "moods/surprised.ico"
+279 ICON "moods/thankful.ico"
+280 ICON "moods/thirsty.ico"
+281 ICON "moods/tired.ico"
+282 ICON "moods/undefined.ico"
+283 ICON "moods/weak.ico"
+284 ICON "moods/worried.ico"
+
+
+300 ICON "activities/doing_chores.ico"
+301 ICON "activities/buying_groceries.ico"
+302 ICON "activities/cleaning.ico"
+303 ICON "activities/cooking.ico"
+304 ICON "activities/doing_maintenance.ico"
+305 ICON "activities/doing_the_dishes.ico"
+306 ICON "activities/doing_the_laundry.ico"
+307 ICON "activities/gardening.ico"
+308 ICON "activities/running_an_errand.ico"
+309 ICON "activities/walking_the_dog.ico"
+320 ICON "activities/drinking.ico"
+321 ICON "activities/having_a_beer.ico"
+322 ICON "activities/having_coffee.ico"
+323 ICON "activities/having_tea.ico"
+340 ICON "activities/eating.ico"
+341 ICON "activities/having_a_snack.ico"
+342 ICON "activities/having_breakfast.ico"
+343 ICON "activities/having_dinner.ico"
+344 ICON "activities/having_lunch.ico"
+360 ICON "activities/exercising.ico"
+361 ICON "activities/cycling.ico"
+362 ICON "activities/dancing.ico"
+363 ICON "activities/hiking.ico"
+364 ICON "activities/jogging.ico"
+365 ICON "activities/playing_sports.ico"
+366 ICON "activities/running.ico"
+367 ICON "activities/skiing.ico"
+368 ICON "activities/swimming.ico"
+369 ICON "activities/working_out.ico"
+380 ICON "activities/grooming.ico"
+381 ICON "activities/at_the_spa.ico"
+382 ICON "activities/brushing_teeth.ico"
+383 ICON "activities/getting_a_haircut.ico"
+384 ICON "activities/shaving.ico"
+385 ICON "activities/taking_a_bath.ico"
+386 ICON "activities/taking_a_shower.ico"
+400 ICON "activities/having_appointment.ico"
+420 ICON "activities/inactive.ico"
+421 ICON "activities/day_off.ico"
+422 ICON "activities/hanging_out.ico"
+423 ICON "activities/hiding.ico"
+424 ICON "activities/on_vacation.ico"
+425 ICON "activities/praying.ico"
+426 ICON "activities/scheduled_holiday.ico"
+427 ICON "activities/sleeping.ico"
+428 ICON "activities/thinking.ico"
+440 ICON "activities/relaxing.ico"
+441 ICON "activities/fishing.ico"
+442 ICON "activities/gaming.ico"
+443 ICON "activities/going_out.ico"
+444 ICON "activities/partying.ico"
+445 ICON "activities/reading.ico"
+446 ICON "activities/rehearsing.ico"
+447 ICON "activities/shopping.ico"
+448 ICON "activities/smoking.ico"
+449 ICON "activities/socializing.ico"
+450 ICON "activities/sunbathing.ico"
+451 ICON "activities/watching_tv.ico"
+452 ICON "activities/watching_a_movie.ico"
+460 ICON "activities/talking.ico"
+461 ICON "activities/in_real_life.ico"
+462 ICON "activities/on_the_phone.ico"
+463 ICON "activities/on_video_phone.ico"
+480 ICON "activities/traveling.ico"
+481 ICON "activities/commuting.ico"
+482 ICON "activities/cycling.ico"
+483 ICON "activities/driving.ico"
+484 ICON "activities/in_a_car.ico"
+485 ICON "activities/on_a_bus.ico"
+486 ICON "activities/on_a_plane.ico"
+487 ICON "activities/on_a_train.ico"
+488 ICON "activities/on_a_trip.ico"
+489 ICON "activities/walking.ico"
+500 ICON "activities/working.ico"
+501 ICON "activities/coding.ico"
+502 ICON "activities/in_a_meeting.ico"
+503 ICON "activities/studying.ico"
+504 ICON "activities/writing.ico"
+
+
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/at_the_spa.ico b/protocols/JabberG/jabber_xstatus/res/activities/at_the_spa.ico
index cca4982a86..cca4982a86 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/at_the_spa.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/at_the_spa.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/bicycling.ico b/protocols/JabberG/jabber_xstatus/res/activities/bicycling.ico
index 8e684f44ff..8e684f44ff 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/bicycling.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/bicycling.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/brushing_teeth.ico b/protocols/JabberG/jabber_xstatus/res/activities/brushing_teeth.ico
index ffe652710d..ffe652710d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/brushing_teeth.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/brushing_teeth.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/buying_groceries.ico b/protocols/JabberG/jabber_xstatus/res/activities/buying_groceries.ico
index d1502a55be..d1502a55be 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/buying_groceries.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/buying_groceries.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/cleaning.ico b/protocols/JabberG/jabber_xstatus/res/activities/cleaning.ico
index 722f98f472..722f98f472 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/cleaning.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/cleaning.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/coding.ico b/protocols/JabberG/jabber_xstatus/res/activities/coding.ico
index 63c812d442..63c812d442 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/coding.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/coding.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/commuting.ico b/protocols/JabberG/jabber_xstatus/res/activities/commuting.ico
index 197a7a7817..197a7a7817 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/commuting.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/commuting.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/cooking.ico b/protocols/JabberG/jabber_xstatus/res/activities/cooking.ico
index e0f5dd91a3..e0f5dd91a3 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/cooking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/cooking.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/cycling.ico b/protocols/JabberG/jabber_xstatus/res/activities/cycling.ico
index 0145d83b87..0145d83b87 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/cycling.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/cycling.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/dancing.ico b/protocols/JabberG/jabber_xstatus/res/activities/dancing.ico
index 97084e0885..97084e0885 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/dancing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/dancing.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/day_off.ico b/protocols/JabberG/jabber_xstatus/res/activities/day_off.ico
index 3d1ccabae0..3d1ccabae0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/day_off.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/day_off.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/doing_chores.ico b/protocols/JabberG/jabber_xstatus/res/activities/doing_chores.ico
index 0f619fa093..0f619fa093 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/doing_chores.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/doing_chores.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/doing_maintenance.ico b/protocols/JabberG/jabber_xstatus/res/activities/doing_maintenance.ico
index 4269f50c1f..4269f50c1f 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/doing_maintenance.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/doing_maintenance.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/doing_the_dishes.ico b/protocols/JabberG/jabber_xstatus/res/activities/doing_the_dishes.ico
index 853c7d2694..853c7d2694 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/doing_the_dishes.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/doing_the_dishes.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/doing_the_laundry.ico b/protocols/JabberG/jabber_xstatus/res/activities/doing_the_laundry.ico
index f24f5da48e..f24f5da48e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/doing_the_laundry.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/doing_the_laundry.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/drinking.ico b/protocols/JabberG/jabber_xstatus/res/activities/drinking.ico
index fe836c7e07..fe836c7e07 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/drinking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/drinking.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/driving.ico b/protocols/JabberG/jabber_xstatus/res/activities/driving.ico
index 0cb11be5b1..0cb11be5b1 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/driving.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/driving.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/eating.ico b/protocols/JabberG/jabber_xstatus/res/activities/eating.ico
index f6fa60ad88..f6fa60ad88 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/eating.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/eating.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/exercising.ico b/protocols/JabberG/jabber_xstatus/res/activities/exercising.ico
index 7ccc6c7684..7ccc6c7684 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/exercising.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/exercising.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/fishing.ico b/protocols/JabberG/jabber_xstatus/res/activities/fishing.ico
index c06b871787..c06b871787 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/fishing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/fishing.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/gaming.ico b/protocols/JabberG/jabber_xstatus/res/activities/gaming.ico
index a65b48d77b..a65b48d77b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/gaming.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/gaming.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/gardening.ico b/protocols/JabberG/jabber_xstatus/res/activities/gardening.ico
index f6ee46440d..f6ee46440d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/gardening.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/gardening.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/getting_a_haircut.ico b/protocols/JabberG/jabber_xstatus/res/activities/getting_a_haircut.ico
index 237a8c5252..237a8c5252 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/getting_a_haircut.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/getting_a_haircut.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/going_out.ico b/protocols/JabberG/jabber_xstatus/res/activities/going_out.ico
index ca66ddc627..ca66ddc627 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/going_out.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/going_out.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/grooming.ico b/protocols/JabberG/jabber_xstatus/res/activities/grooming.ico
index f01b5348cf..f01b5348cf 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/grooming.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/grooming.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/hanging_out.ico b/protocols/JabberG/jabber_xstatus/res/activities/hanging_out.ico
index d7f94262f2..d7f94262f2 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/hanging_out.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/hanging_out.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_a_beer.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_a_beer.ico
index 20d634f85e..20d634f85e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_a_beer.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_a_beer.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_a_snack.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_a_snack.ico
index be74f572fc..be74f572fc 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_a_snack.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_a_snack.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_appointment.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_appointment.ico
index 5e849b224e..5e849b224e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_appointment.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_appointment.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_breakfast.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_breakfast.ico
index c58ec2ef4e..c58ec2ef4e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_breakfast.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_breakfast.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_coffee.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_coffee.ico
index 2646fedb5e..2646fedb5e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_coffee.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_coffee.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_dinner.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_dinner.ico
index 8dbb710ecf..8dbb710ecf 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_dinner.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_dinner.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_lunch.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_lunch.ico
index 4235afbe91..4235afbe91 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_lunch.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_lunch.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/having_tea.ico b/protocols/JabberG/jabber_xstatus/res/activities/having_tea.ico
index cf112ec7f5..cf112ec7f5 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/having_tea.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/having_tea.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/hiding.ico b/protocols/JabberG/jabber_xstatus/res/activities/hiding.ico
index a5cc19e99c..a5cc19e99c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/hiding.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/hiding.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/hiking.ico b/protocols/JabberG/jabber_xstatus/res/activities/hiking.ico
index 48e94d2358..48e94d2358 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/hiking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/hiking.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/in_a_car.ico b/protocols/JabberG/jabber_xstatus/res/activities/in_a_car.ico
index b97e49fcb0..b97e49fcb0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/in_a_car.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/in_a_car.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/in_a_meeting.ico b/protocols/JabberG/jabber_xstatus/res/activities/in_a_meeting.ico
index 371da3a59a..371da3a59a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/in_a_meeting.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/in_a_meeting.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/in_real_life.ico b/protocols/JabberG/jabber_xstatus/res/activities/in_real_life.ico
index bb9bc0f931..bb9bc0f931 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/in_real_life.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/in_real_life.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/inactive.ico b/protocols/JabberG/jabber_xstatus/res/activities/inactive.ico
index 74911a62ca..74911a62ca 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/inactive.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/inactive.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/jogging.ico b/protocols/JabberG/jabber_xstatus/res/activities/jogging.ico
index 082df08b77..082df08b77 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/jogging.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/jogging.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_bus.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_a_bus.ico
index 3f6c315e6a..3f6c315e6a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_bus.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_a_bus.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_plane.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_a_plane.ico
index 3391fb0d20..3391fb0d20 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_plane.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_a_plane.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_train.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_a_train.ico
index 5a455b7a8b..5a455b7a8b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_train.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_a_train.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_trip.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_a_trip.ico
index 287b16d0ce..287b16d0ce 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_a_trip.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_a_trip.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_the_phone.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_the_phone.ico
index 111397e7fa..111397e7fa 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_the_phone.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_the_phone.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_vacation.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_vacation.ico
index c9b43ef894..c9b43ef894 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_vacation.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_vacation.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/on_video_phone.ico b/protocols/JabberG/jabber_xstatus/res/activities/on_video_phone.ico
index 45fa03ebfd..45fa03ebfd 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/on_video_phone.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/on_video_phone.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/partying.ico b/protocols/JabberG/jabber_xstatus/res/activities/partying.ico
index 3b02879831..3b02879831 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/partying.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/partying.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/playing_sports.ico b/protocols/JabberG/jabber_xstatus/res/activities/playing_sports.ico
index 2d5bca3a3c..2d5bca3a3c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/playing_sports.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/playing_sports.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/praying.ico b/protocols/JabberG/jabber_xstatus/res/activities/praying.ico
index d687a69a40..d687a69a40 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/praying.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/praying.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/reading.ico b/protocols/JabberG/jabber_xstatus/res/activities/reading.ico
index 8f218850b8..8f218850b8 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/reading.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/reading.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/rehearsing.ico b/protocols/JabberG/jabber_xstatus/res/activities/rehearsing.ico
index f01323b74d..f01323b74d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/rehearsing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/rehearsing.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/relaxing.ico b/protocols/JabberG/jabber_xstatus/res/activities/relaxing.ico
index d7cbe0abd5..d7cbe0abd5 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/relaxing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/relaxing.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/running.ico b/protocols/JabberG/jabber_xstatus/res/activities/running.ico
index bc4c3f151e..bc4c3f151e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/running.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/running.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/running_an_errand.ico b/protocols/JabberG/jabber_xstatus/res/activities/running_an_errand.ico
index c0dd30c95e..c0dd30c95e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/running_an_errand.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/running_an_errand.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/scheduled_holiday.ico b/protocols/JabberG/jabber_xstatus/res/activities/scheduled_holiday.ico
index 774980c16b..774980c16b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/scheduled_holiday.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/scheduled_holiday.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/shaving.ico b/protocols/JabberG/jabber_xstatus/res/activities/shaving.ico
index 7ed6b0bdc9..7ed6b0bdc9 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/shaving.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/shaving.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/shopping.ico b/protocols/JabberG/jabber_xstatus/res/activities/shopping.ico
index 71ba041daf..71ba041daf 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/shopping.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/shopping.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/skiing.ico b/protocols/JabberG/jabber_xstatus/res/activities/skiing.ico
index 9cd96cf809..9cd96cf809 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/skiing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/skiing.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/sleeping.ico b/protocols/JabberG/jabber_xstatus/res/activities/sleeping.ico
index e8fc48edf7..e8fc48edf7 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/sleeping.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/sleeping.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/smoking.ico b/protocols/JabberG/jabber_xstatus/res/activities/smoking.ico
index f3261a83a6..f3261a83a6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/smoking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/smoking.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/socializing.ico b/protocols/JabberG/jabber_xstatus/res/activities/socializing.ico
index 83297d3084..83297d3084 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/socializing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/socializing.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/studying.ico b/protocols/JabberG/jabber_xstatus/res/activities/studying.ico
index 9dba262974..9dba262974 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/studying.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/studying.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/sunbathing.ico b/protocols/JabberG/jabber_xstatus/res/activities/sunbathing.ico
index 22c489631c..22c489631c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/sunbathing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/sunbathing.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/swimming.ico b/protocols/JabberG/jabber_xstatus/res/activities/swimming.ico
index 2b455683d0..2b455683d0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/swimming.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/swimming.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/taking_a_bath.ico b/protocols/JabberG/jabber_xstatus/res/activities/taking_a_bath.ico
index b93f86c523..b93f86c523 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/taking_a_bath.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/taking_a_bath.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/taking_a_shower.ico b/protocols/JabberG/jabber_xstatus/res/activities/taking_a_shower.ico
index c2021e851b..c2021e851b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/taking_a_shower.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/taking_a_shower.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/talking.ico b/protocols/JabberG/jabber_xstatus/res/activities/talking.ico
index e747618b86..e747618b86 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/talking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/talking.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/thinking.ico b/protocols/JabberG/jabber_xstatus/res/activities/thinking.ico
index e8c8ebed48..e8c8ebed48 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/thinking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/thinking.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/traveling.ico b/protocols/JabberG/jabber_xstatus/res/activities/traveling.ico
index 2dfa197732..2dfa197732 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/traveling.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/traveling.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/walking.ico b/protocols/JabberG/jabber_xstatus/res/activities/walking.ico
index 586ed93029..586ed93029 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/walking.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/walking.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/walking_the_dog.ico b/protocols/JabberG/jabber_xstatus/res/activities/walking_the_dog.ico
index 2be18c864f..2be18c864f 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/walking_the_dog.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/walking_the_dog.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/watching_a_movie.ico b/protocols/JabberG/jabber_xstatus/res/activities/watching_a_movie.ico
index c5c8603a4e..c5c8603a4e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/watching_a_movie.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/watching_a_movie.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/watching_tv.ico b/protocols/JabberG/jabber_xstatus/res/activities/watching_tv.ico
index 887f949657..887f949657 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/watching_tv.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/watching_tv.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/working.ico b/protocols/JabberG/jabber_xstatus/res/activities/working.ico
index 025581a407..025581a407 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/working.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/working.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/working_out.ico b/protocols/JabberG/jabber_xstatus/res/activities/working_out.ico
index 668a5aa7f6..668a5aa7f6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/working_out.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/working_out.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/activities/writing.ico b/protocols/JabberG/jabber_xstatus/res/activities/writing.ico
index 64b74636e1..64b74636e1 100644
--- a/protocols/JabberG/jabber_xstatus/icos/activities/writing.ico
+++ b/protocols/JabberG/jabber_xstatus/res/activities/writing.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/afraid.ico b/protocols/JabberG/jabber_xstatus/res/moods/afraid.ico
index d45fe8ee11..d45fe8ee11 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/afraid.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/afraid.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/amazed.ico b/protocols/JabberG/jabber_xstatus/res/moods/amazed.ico
index 49c2b23e60..49c2b23e60 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/amazed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/amazed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/amorous.ico b/protocols/JabberG/jabber_xstatus/res/moods/amorous.ico
index 302d2e0395..302d2e0395 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/amorous.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/amorous.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/angry.ico b/protocols/JabberG/jabber_xstatus/res/moods/angry.ico
index c8947a4d22..c8947a4d22 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/angry.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/angry.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/annoyed.ico b/protocols/JabberG/jabber_xstatus/res/moods/annoyed.ico
index 850c323a2d..850c323a2d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/annoyed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/annoyed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/anxious.ico b/protocols/JabberG/jabber_xstatus/res/moods/anxious.ico
index d7db20d85d..d7db20d85d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/anxious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/anxious.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/aroused.ico b/protocols/JabberG/jabber_xstatus/res/moods/aroused.ico
index c29feaa8c0..c29feaa8c0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/aroused.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/aroused.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/ashamed.ico b/protocols/JabberG/jabber_xstatus/res/moods/ashamed.ico
index 6a961f2226..6a961f2226 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/ashamed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/ashamed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/bored.ico b/protocols/JabberG/jabber_xstatus/res/moods/bored.ico
index 0bf725ae5e..0bf725ae5e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/bored.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/bored.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/brave.ico b/protocols/JabberG/jabber_xstatus/res/moods/brave.ico
index 8b6b917bc7..8b6b917bc7 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/brave.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/brave.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/calm.ico b/protocols/JabberG/jabber_xstatus/res/moods/calm.ico
index 0ed992ba0d..0ed992ba0d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/calm.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/calm.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/cautious.ico b/protocols/JabberG/jabber_xstatus/res/moods/cautious.ico
index df89f579f9..df89f579f9 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/cautious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/cautious.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/cold.ico b/protocols/JabberG/jabber_xstatus/res/moods/cold.ico
index b6b7c1e884..b6b7c1e884 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/cold.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/cold.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/confident.ico b/protocols/JabberG/jabber_xstatus/res/moods/confident.ico
index bce9395830..bce9395830 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/confident.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/confident.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/confused.ico b/protocols/JabberG/jabber_xstatus/res/moods/confused.ico
index 41f2e7eb4c..41f2e7eb4c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/confused.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/confused.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/contemplative.ico b/protocols/JabberG/jabber_xstatus/res/moods/contemplative.ico
index bd005f816f..bd005f816f 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/contemplative.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/contemplative.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/contented.ico b/protocols/JabberG/jabber_xstatus/res/moods/contented.ico
index e97d4b9db3..e97d4b9db3 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/contented.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/contented.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/cranky.ico b/protocols/JabberG/jabber_xstatus/res/moods/cranky.ico
index ce8468307a..ce8468307a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/cranky.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/cranky.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/crazy.ico b/protocols/JabberG/jabber_xstatus/res/moods/crazy.ico
index b2538674b6..b2538674b6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/crazy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/crazy.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/creative.ico b/protocols/JabberG/jabber_xstatus/res/moods/creative.ico
index 2ac57e40af..2ac57e40af 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/creative.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/creative.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/curious.ico b/protocols/JabberG/jabber_xstatus/res/moods/curious.ico
index 6bedb50282..6bedb50282 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/curious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/curious.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/dejected.ico b/protocols/JabberG/jabber_xstatus/res/moods/dejected.ico
index aea3675a09..aea3675a09 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/dejected.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/dejected.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/depressed.ico b/protocols/JabberG/jabber_xstatus/res/moods/depressed.ico
index 074ffd921d..074ffd921d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/depressed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/depressed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/disappointed.ico b/protocols/JabberG/jabber_xstatus/res/moods/disappointed.ico
index 092df4b59c..092df4b59c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/disappointed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/disappointed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/disgusted.ico b/protocols/JabberG/jabber_xstatus/res/moods/disgusted.ico
index d83ce3b7df..d83ce3b7df 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/disgusted.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/disgusted.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/dismayed.ico b/protocols/JabberG/jabber_xstatus/res/moods/dismayed.ico
index abda47285c..abda47285c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/dismayed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/dismayed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/distracted.ico b/protocols/JabberG/jabber_xstatus/res/moods/distracted.ico
index e9809551fc..e9809551fc 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/distracted.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/distracted.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/embarrassed.ico b/protocols/JabberG/jabber_xstatus/res/moods/embarrassed.ico
index 62cdcd4c60..62cdcd4c60 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/embarrassed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/embarrassed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/envious.ico b/protocols/JabberG/jabber_xstatus/res/moods/envious.ico
index 29a23da950..29a23da950 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/envious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/envious.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/excited.ico b/protocols/JabberG/jabber_xstatus/res/moods/excited.ico
index 42a149ef5b..42a149ef5b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/excited.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/excited.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/flirtatious.ico b/protocols/JabberG/jabber_xstatus/res/moods/flirtatious.ico
index af9b114955..af9b114955 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/flirtatious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/flirtatious.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/frustrated.ico b/protocols/JabberG/jabber_xstatus/res/moods/frustrated.ico
index 790573ad4d..790573ad4d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/frustrated.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/frustrated.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/grateful.ico b/protocols/JabberG/jabber_xstatus/res/moods/grateful.ico
index 857b34c6c2..857b34c6c2 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/grateful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/grateful.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/grieving.ico b/protocols/JabberG/jabber_xstatus/res/moods/grieving.ico
index 5b5774b9af..5b5774b9af 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/grieving.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/grieving.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/grumpy.ico b/protocols/JabberG/jabber_xstatus/res/moods/grumpy.ico
index f37395703a..f37395703a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/grumpy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/grumpy.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/guilty.ico b/protocols/JabberG/jabber_xstatus/res/moods/guilty.ico
index 154d32ed1e..154d32ed1e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/guilty.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/guilty.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/happy.ico b/protocols/JabberG/jabber_xstatus/res/moods/happy.ico
index f6b97adbd0..f6b97adbd0 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/happy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/happy.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/hopeful.ico b/protocols/JabberG/jabber_xstatus/res/moods/hopeful.ico
index c012b33ee1..c012b33ee1 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/hopeful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/hopeful.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/hot.ico b/protocols/JabberG/jabber_xstatus/res/moods/hot.ico
index 1fc519a092..1fc519a092 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/hot.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/hot.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/humbled.ico b/protocols/JabberG/jabber_xstatus/res/moods/humbled.ico
index 8df3f7fca4..8df3f7fca4 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/humbled.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/humbled.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/humiliated.ico b/protocols/JabberG/jabber_xstatus/res/moods/humiliated.ico
index 6c2c2ebb92..6c2c2ebb92 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/humiliated.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/humiliated.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/hungry.ico b/protocols/JabberG/jabber_xstatus/res/moods/hungry.ico
index 9b4f03c9d9..9b4f03c9d9 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/hungry.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/hungry.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/hurt.ico b/protocols/JabberG/jabber_xstatus/res/moods/hurt.ico
index a23f46d955..a23f46d955 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/hurt.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/hurt.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/impressed.ico b/protocols/JabberG/jabber_xstatus/res/moods/impressed.ico
index c2af48ccc4..c2af48ccc4 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/impressed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/impressed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/in_awe.ico b/protocols/JabberG/jabber_xstatus/res/moods/in_awe.ico
index d0f4ee317b..d0f4ee317b 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/in_awe.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/in_awe.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/in_love.ico b/protocols/JabberG/jabber_xstatus/res/moods/in_love.ico
index 81426556d9..81426556d9 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/in_love.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/in_love.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/indignant.ico b/protocols/JabberG/jabber_xstatus/res/moods/indignant.ico
index c2a566bbff..c2a566bbff 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/indignant.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/indignant.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/interested.ico b/protocols/JabberG/jabber_xstatus/res/moods/interested.ico
index 0e728994a7..0e728994a7 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/interested.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/interested.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/intoxicated.ico b/protocols/JabberG/jabber_xstatus/res/moods/intoxicated.ico
index e7295c7762..e7295c7762 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/intoxicated.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/intoxicated.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/invincible.ico b/protocols/JabberG/jabber_xstatus/res/moods/invincible.ico
index 08f145fc00..08f145fc00 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/invincible.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/invincible.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/jealous.ico b/protocols/JabberG/jabber_xstatus/res/moods/jealous.ico
index c1ac6dd000..c1ac6dd000 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/jealous.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/jealous.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/lonely.ico b/protocols/JabberG/jabber_xstatus/res/moods/lonely.ico
index 8ce7bbbe82..8ce7bbbe82 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/lonely.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/lonely.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/lost.ico b/protocols/JabberG/jabber_xstatus/res/moods/lost.ico
index db23931d39..db23931d39 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/lost.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/lost.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/lucky.ico b/protocols/JabberG/jabber_xstatus/res/moods/lucky.ico
index 4e2894114d..4e2894114d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/lucky.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/lucky.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/mean.ico b/protocols/JabberG/jabber_xstatus/res/moods/mean.ico
index 9a5825cf04..9a5825cf04 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/mean.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/mean.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/moody.ico b/protocols/JabberG/jabber_xstatus/res/moods/moody.ico
index d025001a5a..d025001a5a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/moody.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/moody.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/nervous.ico b/protocols/JabberG/jabber_xstatus/res/moods/nervous.ico
index a8b42584b6..a8b42584b6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/nervous.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/nervous.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/neutral.ico b/protocols/JabberG/jabber_xstatus/res/moods/neutral.ico
index bc3f8ad45c..bc3f8ad45c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/neutral.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/neutral.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/offended.ico b/protocols/JabberG/jabber_xstatus/res/moods/offended.ico
index eb74f4235c..eb74f4235c 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/offended.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/offended.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/outraged.ico b/protocols/JabberG/jabber_xstatus/res/moods/outraged.ico
index 1b8e99ee31..1b8e99ee31 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/outraged.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/outraged.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/playful.ico b/protocols/JabberG/jabber_xstatus/res/moods/playful.ico
index b6f7e55745..b6f7e55745 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/playful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/playful.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/proud.ico b/protocols/JabberG/jabber_xstatus/res/moods/proud.ico
index 7ad6f97064..7ad6f97064 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/proud.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/proud.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/relaxed.ico b/protocols/JabberG/jabber_xstatus/res/moods/relaxed.ico
index bba4906d3e..bba4906d3e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/relaxed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/relaxed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/relieved.ico b/protocols/JabberG/jabber_xstatus/res/moods/relieved.ico
index 3bbb2ae30d..3bbb2ae30d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/relieved.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/relieved.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/remorseful.ico b/protocols/JabberG/jabber_xstatus/res/moods/remorseful.ico
index 095e18e468..095e18e468 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/remorseful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/remorseful.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/restless.ico b/protocols/JabberG/jabber_xstatus/res/moods/restless.ico
index 6e4083a57d..6e4083a57d 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/restless.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/restless.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/sad.ico b/protocols/JabberG/jabber_xstatus/res/moods/sad.ico
index 07eae404a4..07eae404a4 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/sad.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/sad.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/sarcastic.ico b/protocols/JabberG/jabber_xstatus/res/moods/sarcastic.ico
index b23431bfaa..b23431bfaa 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/sarcastic.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/sarcastic.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/satisfied.ico b/protocols/JabberG/jabber_xstatus/res/moods/satisfied.ico
index aecdf590ff..aecdf590ff 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/satisfied.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/satisfied.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/serious.ico b/protocols/JabberG/jabber_xstatus/res/moods/serious.ico
index b9005bebb2..b9005bebb2 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/serious.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/serious.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/shocked.ico b/protocols/JabberG/jabber_xstatus/res/moods/shocked.ico
index 011dea4e60..011dea4e60 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/shocked.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/shocked.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/shy.ico b/protocols/JabberG/jabber_xstatus/res/moods/shy.ico
index a7c02b7916..a7c02b7916 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/shy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/shy.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/sick.ico b/protocols/JabberG/jabber_xstatus/res/moods/sick.ico
index d3a0338b87..d3a0338b87 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/sick.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/sick.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/sleepy.ico b/protocols/JabberG/jabber_xstatus/res/moods/sleepy.ico
index 998164780e..998164780e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/sleepy.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/sleepy.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/spontaneous.ico b/protocols/JabberG/jabber_xstatus/res/moods/spontaneous.ico
index 3670422597..3670422597 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/spontaneous.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/spontaneous.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/stressed.ico b/protocols/JabberG/jabber_xstatus/res/moods/stressed.ico
index 94f0472574..94f0472574 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/stressed.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/stressed.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/strong.ico b/protocols/JabberG/jabber_xstatus/res/moods/strong.ico
index 01657488b6..01657488b6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/strong.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/strong.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/surprised.ico b/protocols/JabberG/jabber_xstatus/res/moods/surprised.ico
index 882cfcd60a..882cfcd60a 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/surprised.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/surprised.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/thankful.ico b/protocols/JabberG/jabber_xstatus/res/moods/thankful.ico
index 56cfc59961..56cfc59961 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/thankful.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/thankful.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/thirsty.ico b/protocols/JabberG/jabber_xstatus/res/moods/thirsty.ico
index d678569bd6..d678569bd6 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/thirsty.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/thirsty.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/tired.ico b/protocols/JabberG/jabber_xstatus/res/moods/tired.ico
index 90292c7e0e..90292c7e0e 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/tired.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/tired.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/undefined.ico b/protocols/JabberG/jabber_xstatus/res/moods/undefined.ico
index 078db99f8f..078db99f8f 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/undefined.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/undefined.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/weak.ico b/protocols/JabberG/jabber_xstatus/res/moods/weak.ico
index 408b769b93..408b769b93 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/weak.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/weak.ico
Binary files differ
diff --git a/protocols/JabberG/jabber_xstatus/icos/moods/worried.ico b/protocols/JabberG/jabber_xstatus/res/moods/worried.ico
index 45942e7c43..45942e7c43 100644
--- a/protocols/JabberG/jabber_xstatus/icos/moods/worried.ico
+++ b/protocols/JabberG/jabber_xstatus/res/moods/worried.ico
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj
index 1051ada6bb..59d93a3827 100644
--- a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj
+++ b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj
@@ -119,10 +119,10 @@
</ResourceCompile>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="resource.h" />
+ <ClInclude Include="src\resource.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="Proto_Jabber.rc" />
+ <ResourceCompile Include="res\Proto_Jabber.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters
index f78bc8dede..ae91eacccf 100644
--- a/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters
+++ b/protocols/JabberG/proto_jabber/Proto_Jabber.vcxproj.filters
@@ -11,12 +11,12 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="resource.h">
+ <ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="Proto_Jabber.rc">
+ <ResourceCompile Include="res\Proto_Jabber.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
diff --git a/protocols/JabberG/proto_jabber/icos/Away.ico b/protocols/JabberG/proto_jabber/res/Away.ico
index d9efcb6be9..d9efcb6be9 100644
--- a/protocols/JabberG/proto_jabber/icos/Away.ico
+++ b/protocols/JabberG/proto_jabber/res/Away.ico
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/icos/DND.ico b/protocols/JabberG/proto_jabber/res/DND.ico
index 5a96752278..5a96752278 100644
--- a/protocols/JabberG/proto_jabber/icos/DND.ico
+++ b/protocols/JabberG/proto_jabber/res/DND.ico
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/icos/FFC.ico b/protocols/JabberG/proto_jabber/res/FFC.ico
index 7a7ca70b2e..7a7ca70b2e 100644
--- a/protocols/JabberG/proto_jabber/icos/FFC.ico
+++ b/protocols/JabberG/proto_jabber/res/FFC.ico
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/icos/Invisible.ico b/protocols/JabberG/proto_jabber/res/Invisible.ico
index 4636cc20f3..4636cc20f3 100644
--- a/protocols/JabberG/proto_jabber/icos/Invisible.ico
+++ b/protocols/JabberG/proto_jabber/res/Invisible.ico
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/icos/NA.ico b/protocols/JabberG/proto_jabber/res/NA.ico
index f3c08d0ecf..f3c08d0ecf 100644
--- a/protocols/JabberG/proto_jabber/icos/NA.ico
+++ b/protocols/JabberG/proto_jabber/res/NA.ico
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/icos/Offline.ico b/protocols/JabberG/proto_jabber/res/Offline.ico
index ba6d39a5aa..ba6d39a5aa 100644
--- a/protocols/JabberG/proto_jabber/icos/Offline.ico
+++ b/protocols/JabberG/proto_jabber/res/Offline.ico
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/icos/Online.ico b/protocols/JabberG/proto_jabber/res/Online.ico
index 9e18c3dd74..9e18c3dd74 100644
--- a/protocols/JabberG/proto_jabber/icos/Online.ico
+++ b/protocols/JabberG/proto_jabber/res/Online.ico
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/Proto_Jabber.rc b/protocols/JabberG/proto_jabber/res/Proto_Jabber.rc
index b3188f3d4a..03cfefcd8b 100644
--- a/protocols/JabberG/proto_jabber/Proto_Jabber.rc
+++ b/protocols/JabberG/proto_jabber/res/Proto_Jabber.rc
Binary files differ
diff --git a/protocols/JabberG/proto_jabber/resource.h b/protocols/JabberG/proto_jabber/src/resource.h
index d7b66a17e2..d7b66a17e2 100644
--- a/protocols/JabberG/proto_jabber/resource.h
+++ b/protocols/JabberG/proto_jabber/src/resource.h
Binary files differ
diff --git a/protocols/JabberG/icos/add2roster.ico b/protocols/JabberG/res/add2roster.ico
index 0b0d1462c3..0b0d1462c3 100644
--- a/protocols/JabberG/icos/add2roster.ico
+++ b/protocols/JabberG/res/add2roster.ico
Binary files differ
diff --git a/protocols/JabberG/icos/addcontact.ico b/protocols/JabberG/res/addcontact.ico
index 596593efb1..596593efb1 100644
--- a/protocols/JabberG/icos/addcontact.ico
+++ b/protocols/JabberG/res/addcontact.ico
Binary files differ
diff --git a/protocols/JabberG/icos/arrow_down.ico b/protocols/JabberG/res/arrow_down.ico
index 777cbfe161..777cbfe161 100644
--- a/protocols/JabberG/icos/arrow_down.ico
+++ b/protocols/JabberG/res/arrow_down.ico
Binary files differ
diff --git a/protocols/JabberG/icos/arrow_up.ico b/protocols/JabberG/res/arrow_up.ico
index 543644cbbc..543644cbbc 100644
--- a/protocols/JabberG/icos/arrow_up.ico
+++ b/protocols/JabberG/res/arrow_up.ico
Binary files differ
diff --git a/protocols/JabberG/icos/auth_revoke.ico b/protocols/JabberG/res/auth_revoke.ico
index 42dda06ce4..42dda06ce4 100644
--- a/protocols/JabberG/icos/auth_revoke.ico
+++ b/protocols/JabberG/res/auth_revoke.ico
Binary files differ
diff --git a/protocols/JabberG/icos/bookmarks.ico b/protocols/JabberG/res/bookmarks.ico
index e66ee868f9..e66ee868f9 100644
--- a/protocols/JabberG/icos/bookmarks.ico
+++ b/protocols/JabberG/res/bookmarks.ico
Binary files differ
diff --git a/protocols/JabberG/icos/command.ico b/protocols/JabberG/res/command.ico
index 1138c0b882..1138c0b882 100644
--- a/protocols/JabberG/icos/command.ico
+++ b/protocols/JabberG/res/command.ico
Binary files differ
diff --git a/protocols/JabberG/icos/console.ico b/protocols/JabberG/res/console.ico
index ec2ea2159f..ec2ea2159f 100644
--- a/protocols/JabberG/icos/console.ico
+++ b/protocols/JabberG/res/console.ico
Binary files differ
diff --git a/protocols/JabberG/icos/delete.ico b/protocols/JabberG/res/delete.ico
index e4b674dcd5..e4b674dcd5 100644
--- a/protocols/JabberG/icos/delete.ico
+++ b/protocols/JabberG/res/delete.ico
Binary files differ
diff --git a/protocols/JabberG/icos/disco_fail.ico b/protocols/JabberG/res/disco_fail.ico
index 39e5a1b800..39e5a1b800 100644
--- a/protocols/JabberG/icos/disco_fail.ico
+++ b/protocols/JabberG/res/disco_fail.ico
Binary files differ
diff --git a/protocols/JabberG/icos/disco_in_progress.ico b/protocols/JabberG/res/disco_in_progress.ico
index c1c3e243c5..c1c3e243c5 100644
--- a/protocols/JabberG/icos/disco_in_progress.ico
+++ b/protocols/JabberG/res/disco_in_progress.ico
Binary files differ
diff --git a/protocols/JabberG/icos/disco_ok.ico b/protocols/JabberG/res/disco_ok.ico
index d117a9ab46..d117a9ab46 100644
--- a/protocols/JabberG/icos/disco_ok.ico
+++ b/protocols/JabberG/res/disco_ok.ico
Binary files differ
diff --git a/protocols/JabberG/icos/filter.ico b/protocols/JabberG/res/filter.ico
index f4d5347cea..f4d5347cea 100644
--- a/protocols/JabberG/icos/filter.ico
+++ b/protocols/JabberG/res/filter.ico
Binary files differ
diff --git a/protocols/JabberG/icos/go.ico b/protocols/JabberG/res/go.ico
index 22abe8e7cc..22abe8e7cc 100644
--- a/protocols/JabberG/icos/go.ico
+++ b/protocols/JabberG/res/go.ico
Binary files differ
diff --git a/protocols/JabberG/icos/grant.ico b/protocols/JabberG/res/grant.ico
index 8e18fe3754..8e18fe3754 100644
--- a/protocols/JabberG/icos/grant.ico
+++ b/protocols/JabberG/res/grant.ico
Binary files differ
diff --git a/protocols/JabberG/icos/group.ico b/protocols/JabberG/res/group.ico
index 3e4cfcc606..3e4cfcc606 100644
--- a/protocols/JabberG/icos/group.ico
+++ b/protocols/JabberG/res/group.ico
Binary files differ
diff --git a/protocols/JabberG/icos/home.ico b/protocols/JabberG/res/home.ico
index 2328a8ef16..2328a8ef16 100644
--- a/protocols/JabberG/icos/home.ico
+++ b/protocols/JabberG/res/home.ico
Binary files differ
diff --git a/protocols/JabberG/icos/jabber.ico b/protocols/JabberG/res/jabber.ico
index 61644cbfe9..61644cbfe9 100644
--- a/protocols/JabberG/icos/jabber.ico
+++ b/protocols/JabberG/res/jabber.ico
Binary files differ
diff --git a/protocols/JabberG/jabber.rc b/protocols/JabberG/res/jabber.rc
index a2daa20277..7e88d2cd4a 100644
--- a/protocols/JabberG/jabber.rc
+++ b/protocols/JabberG/res/jabber.rc
@@ -1,6 +1,6 @@
// Microsoft Visual C++ generated resource script.
//
-#include "resource.h"
+#include "..\src\resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
@@ -780,6 +780,37 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,200,203,50,14
END
+IDD_CONSOLE DIALOGEX 0, 0, 354, 240
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+EXSTYLE WS_EX_CONTROLPARENT
+CAPTION "XML Console"
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ CONTROL "",IDC_CONSOLE,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x804,5,5,343,137
+ CONTROL "Custom1",IDC_BTN_MSG,"MButtonClass",WS_TABSTOP,5,147,16,14
+ CONTROL "Custom1",IDC_BTN_PRESENCE,"MButtonClass",WS_TABSTOP,21,147,16,14
+ CONTROL "Custom1",IDC_BTN_IQ,"MButtonClass",WS_TABSTOP,37,147,16,14
+ CONTROL "Custom1",IDC_BTN_FILTER,"MButtonClass",WS_TABSTOP,68,147,16,14
+ COMBOBOX IDC_CB_FILTER,86,147,245,91,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ CONTROL "Custom1",IDC_BTN_FILTER_REFRESH,"MButtonClass",WS_TABSTOP,333,147,16,14
+ EDITTEXT IDC_CONSOLEIN,5,166,343,38,ES_MULTILINE | WS_VSCROLL
+ PUSHBUTTON "Reset log",IDC_RESET,244,209,50,14
+ DEFPUSHBUTTON "Send",IDOK,299,209,50,14
+END
+
+IDD_GROUPCHAT_INPUT DIALOGEX 0, 0, 242, 42
+STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+ EDITTEXT IDC_TXT_MULTILINE,6,6,230,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | NOT WS_VISIBLE | WS_VSCROLL
+ EDITTEXT IDC_TXT_PASSWORD,6,6,230,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | ES_PASSWORD
+ COMBOBOX IDC_TXT_COMBO,6,6,230,92,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+ CONTROL "",IDC_TXT_RICHEDIT,RICHEDIT_CLASS,NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12
+ DEFPUSHBUTTON "OK",IDOK,131,23,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,186,23,50,14
+END
+
/////////////////////////////////////////////////////////////////////////////
//
@@ -845,60 +876,60 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_JABBER ICON "icos/jabber.ico"
-IDI_ARROW_DOWN ICON "icos/arrow_down.ico"
-IDI_ARROW_UP ICON "icos/arrow_up.ico"
-IDI_DISCO_PROGRESS ICON "icos/disco_in_progress.ico"
-IDI_NODE_RSS ICON "icos/rss.ico"
-IDI_NODE_SERVER ICON "icos/server.ico"
-IDI_NODE_STORE ICON "icos/store.ico"
-IDI_NODE_WEATHER ICON "icos/weather.ico"
-IDI_DISCO_OK ICON "icos/disco_ok.ico"
-IDI_DISCO_FAIL ICON "icos/disco_fail.ico"
-IDI_GROUP ICON "icos/group.ico"
-IDI_KEYS ICON "icos/key.ico"
-IDI_ADDCONTACT ICON "icos/addcontact.ico"
-IDI_ADDROSTER ICON "icos/add2roster.ico"
-IDI_AGENTS ICON "icos/roster.ico"
-IDI_VCARD ICON "icos/pages.ico"
-IDI_DELETE ICON "icos/delete.ico"
-IDI_EDIT ICON "icos/rename.ico"
-IDI_GRANT ICON "icos/grant.ico"
-IDI_OPEN ICON "icos/open.ico"
-IDI_REQUEST ICON "icos/request.ico"
-IDI_USER2ROOM ICON "icos/user2room.ico"
-IDI_SAVE ICON "icos/save.ico"
-IDI_LOGIN ICON "icos/login.ico"
-IDI_AUTHREVOKE ICON "icos/auth_revoke.ico"
-IDI_REFRESH ICON "icos/refresh.ico"
-IDI_COMMAND ICON "icos/command.ico"
-IDI_BOOKMARKS ICON "icos/bookmarks.ico"
-IDI_PRIVACY_LISTS ICON "icos/privacy_lists.ico"
-IDI_SERVICE_DISCOVERY ICON "icos/service_discovery.ico"
-IDI_VIEW_LIST ICON "icos/view_as_list.ico"
-IDI_VIEW_TREE ICON "icos/view_as_tree.ico"
-IDI_FILTER_APPLY ICON "icos/filter.ico"
-IDI_BROWSE ICON "icos/go.ico"
-IDI_NAV_HOME ICON "icos/home.ico"
-IDI_NAV_REFRESH ICON "icos/refresh_node.ico"
-IDI_FILTER_RESET ICON "icos/reset_filter.ico"
-IDI_CONSOLE ICON "icos/console.ico"
-IDI_PL_MSG_ALLOW ICON "icos/message_allow.ico"
-IDI_PL_MSG_DENY ICON "icos/message_deny.ico"
-IDI_PL_PRIN_ALLOW ICON "icos/presence_in_allow.ico"
-IDI_PL_PRIN_DENY ICON "icos/presence_in_deny.ico"
-IDI_PL_PROUT_ALLOW ICON "icos/presence_out_allow.ico"
-IDI_PL_PROUT_DENY ICON "icos/presence_out_deny.ico"
-IDI_PL_QUERY_ALLOW ICON "icos/query_allow.ico"
-IDI_PL_QUERY_DENY ICON "icos/query_deny.ico"
-IDI_PL_LIST_ACTIVE ICON "icos/plist_active.ico"
-IDI_PL_LIST_ANY ICON "icos/plist_any.ico"
-IDI_PL_LIST_DEFAULT ICON "icos/plist_default.ico"
-IDI_TRANSPORT ICON "icos/transport.ico"
-IDI_TRANSPORTL ICON "icos/transport_local.ico"
-IDI_HTTP_AUTH ICON "icos/openid.ico"
-IDI_NOTES ICON "icos\\notes.ico"
-IDI_SEND_NOTE ICON "icos\\send_note.ico"
+IDI_JABBER ICON "jabber.ico"
+IDI_ARROW_DOWN ICON "arrow_down.ico"
+IDI_ARROW_UP ICON "arrow_up.ico"
+IDI_DISCO_PROGRESS ICON "disco_in_progress.ico"
+IDI_NODE_RSS ICON "rss.ico"
+IDI_NODE_SERVER ICON "server.ico"
+IDI_NODE_STORE ICON "store.ico"
+IDI_NODE_WEATHER ICON "weather.ico"
+IDI_DISCO_OK ICON "disco_ok.ico"
+IDI_DISCO_FAIL ICON "disco_fail.ico"
+IDI_GROUP ICON "group.ico"
+IDI_KEYS ICON "key.ico"
+IDI_ADDCONTACT ICON "addcontact.ico"
+IDI_ADDROSTER ICON "add2roster.ico"
+IDI_AGENTS ICON "roster.ico"
+IDI_VCARD ICON "pages.ico"
+IDI_DELETE ICON "delete.ico"
+IDI_EDIT ICON "rename.ico"
+IDI_GRANT ICON "grant.ico"
+IDI_OPEN ICON "open.ico"
+IDI_REQUEST ICON "request.ico"
+IDI_USER2ROOM ICON "user2room.ico"
+IDI_SAVE ICON "save.ico"
+IDI_LOGIN ICON "login.ico"
+IDI_AUTHREVOKE ICON "auth_revoke.ico"
+IDI_REFRESH ICON "refresh.ico"
+IDI_COMMAND ICON "command.ico"
+IDI_BOOKMARKS ICON "bookmarks.ico"
+IDI_PRIVACY_LISTS ICON "privacy_lists.ico"
+IDI_SERVICE_DISCOVERY ICON "service_discovery.ico"
+IDI_VIEW_LIST ICON "view_as_list.ico"
+IDI_VIEW_TREE ICON "view_as_tree.ico"
+IDI_FILTER_APPLY ICON "filter.ico"
+IDI_BROWSE ICON "go.ico"
+IDI_NAV_HOME ICON "home.ico"
+IDI_NAV_REFRESH ICON "refresh_node.ico"
+IDI_FILTER_RESET ICON "reset_filter.ico"
+IDI_CONSOLE ICON "console.ico"
+IDI_PL_MSG_ALLOW ICON "message_allow.ico"
+IDI_PL_MSG_DENY ICON "message_deny.ico"
+IDI_PL_PRIN_ALLOW ICON "presence_in_allow.ico"
+IDI_PL_PRIN_DENY ICON "presence_in_deny.ico"
+IDI_PL_PROUT_ALLOW ICON "presence_out_allow.ico"
+IDI_PL_PROUT_DENY ICON "presence_out_deny.ico"
+IDI_PL_QUERY_ALLOW ICON "query_allow.ico"
+IDI_PL_QUERY_DENY ICON "query_deny.ico"
+IDI_PL_LIST_ACTIVE ICON "plist_active.ico"
+IDI_PL_LIST_ANY ICON "plist_any.ico"
+IDI_PL_LIST_DEFAULT ICON "plist_default.ico"
+IDI_TRANSPORT ICON "transport.ico"
+IDI_TRANSPORTL ICON "transport_local.ico"
+IDI_HTTP_AUTH ICON "openid.ico"
+IDI_NOTES ICON "notes.ico"
+IDI_SEND_NOTE ICON "send_note.ico"
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
@@ -908,7 +939,7 @@ IDI_SEND_NOTE ICON "icos\\send_note.ico"
1 TEXTINCLUDE
BEGIN
- "resource.h\0"
+ "..\\src\\resource.h\0"
END
2 TEXTINCLUDE
diff --git a/protocols/JabberG/icos/key.ico b/protocols/JabberG/res/key.ico
index 17f9bc23e8..17f9bc23e8 100644
--- a/protocols/JabberG/icos/key.ico
+++ b/protocols/JabberG/res/key.ico
Binary files differ
diff --git a/protocols/JabberG/icos/login.ico b/protocols/JabberG/res/login.ico
index 5b72f5e87a..5b72f5e87a 100644
--- a/protocols/JabberG/icos/login.ico
+++ b/protocols/JabberG/res/login.ico
Binary files differ
diff --git a/protocols/JabberG/icos/message_allow.ico b/protocols/JabberG/res/message_allow.ico
index b82dc84cb4..b82dc84cb4 100644
--- a/protocols/JabberG/icos/message_allow.ico
+++ b/protocols/JabberG/res/message_allow.ico
Binary files differ
diff --git a/protocols/JabberG/icos/message_deny.ico b/protocols/JabberG/res/message_deny.ico
index 4f67487b7a..4f67487b7a 100644
--- a/protocols/JabberG/icos/message_deny.ico
+++ b/protocols/JabberG/res/message_deny.ico
Binary files differ
diff --git a/protocols/JabberG/icos/notes.ico b/protocols/JabberG/res/notes.ico
index 4a2eb48dfa..4a2eb48dfa 100644
--- a/protocols/JabberG/icos/notes.ico
+++ b/protocols/JabberG/res/notes.ico
Binary files differ
diff --git a/protocols/JabberG/icos/open.ico b/protocols/JabberG/res/open.ico
index bc56c4f149..bc56c4f149 100644
--- a/protocols/JabberG/icos/open.ico
+++ b/protocols/JabberG/res/open.ico
Binary files differ
diff --git a/protocols/JabberG/icos/openid.ico b/protocols/JabberG/res/openid.ico
index d8e2f9f240..d8e2f9f240 100644
--- a/protocols/JabberG/icos/openid.ico
+++ b/protocols/JabberG/res/openid.ico
Binary files differ
diff --git a/protocols/JabberG/icos/pages.ico b/protocols/JabberG/res/pages.ico
index 715b7a1bec..715b7a1bec 100644
--- a/protocols/JabberG/icos/pages.ico
+++ b/protocols/JabberG/res/pages.ico
Binary files differ
diff --git a/protocols/JabberG/icos/plist_active.ico b/protocols/JabberG/res/plist_active.ico
index 3cffd4d21d..3cffd4d21d 100644
--- a/protocols/JabberG/icos/plist_active.ico
+++ b/protocols/JabberG/res/plist_active.ico
Binary files differ
diff --git a/protocols/JabberG/icos/plist_any.ico b/protocols/JabberG/res/plist_any.ico
index 052e670921..052e670921 100644
--- a/protocols/JabberG/icos/plist_any.ico
+++ b/protocols/JabberG/res/plist_any.ico
Binary files differ
diff --git a/protocols/JabberG/icos/plist_default.ico b/protocols/JabberG/res/plist_default.ico
index f282227f9a..f282227f9a 100644
--- a/protocols/JabberG/icos/plist_default.ico
+++ b/protocols/JabberG/res/plist_default.ico
Binary files differ
diff --git a/protocols/JabberG/icos/presence_in_allow.ico b/protocols/JabberG/res/presence_in_allow.ico
index 400b8b6f13..400b8b6f13 100644
--- a/protocols/JabberG/icos/presence_in_allow.ico
+++ b/protocols/JabberG/res/presence_in_allow.ico
Binary files differ
diff --git a/protocols/JabberG/icos/presence_in_deny.ico b/protocols/JabberG/res/presence_in_deny.ico
index 99bd3a0ec7..99bd3a0ec7 100644
--- a/protocols/JabberG/icos/presence_in_deny.ico
+++ b/protocols/JabberG/res/presence_in_deny.ico
Binary files differ
diff --git a/protocols/JabberG/icos/presence_out_allow.ico b/protocols/JabberG/res/presence_out_allow.ico
index b7d644e8fb..b7d644e8fb 100644
--- a/protocols/JabberG/icos/presence_out_allow.ico
+++ b/protocols/JabberG/res/presence_out_allow.ico
Binary files differ
diff --git a/protocols/JabberG/icos/presence_out_deny.ico b/protocols/JabberG/res/presence_out_deny.ico
index 8bfa078d5b..8bfa078d5b 100644
--- a/protocols/JabberG/icos/presence_out_deny.ico
+++ b/protocols/JabberG/res/presence_out_deny.ico
Binary files differ
diff --git a/protocols/JabberG/icos/privacy_lists.ico b/protocols/JabberG/res/privacy_lists.ico
index 2a55157ff7..2a55157ff7 100644
--- a/protocols/JabberG/icos/privacy_lists.ico
+++ b/protocols/JabberG/res/privacy_lists.ico
Binary files differ
diff --git a/protocols/JabberG/icos/query_allow.ico b/protocols/JabberG/res/query_allow.ico
index e6c3a4bfe6..e6c3a4bfe6 100644
--- a/protocols/JabberG/icos/query_allow.ico
+++ b/protocols/JabberG/res/query_allow.ico
Binary files differ
diff --git a/protocols/JabberG/icos/query_deny.ico b/protocols/JabberG/res/query_deny.ico
index dd358a484e..dd358a484e 100644
--- a/protocols/JabberG/icos/query_deny.ico
+++ b/protocols/JabberG/res/query_deny.ico
Binary files differ
diff --git a/protocols/JabberG/icos/refresh.ico b/protocols/JabberG/res/refresh.ico
index 81c6d95f4a..81c6d95f4a 100644
--- a/protocols/JabberG/icos/refresh.ico
+++ b/protocols/JabberG/res/refresh.ico
Binary files differ
diff --git a/protocols/JabberG/icos/refresh_node.ico b/protocols/JabberG/res/refresh_node.ico
index 6c7efc744f..6c7efc744f 100644
--- a/protocols/JabberG/icos/refresh_node.ico
+++ b/protocols/JabberG/res/refresh_node.ico
Binary files differ
diff --git a/protocols/JabberG/icos/rename.ico b/protocols/JabberG/res/rename.ico
index fa8abc8785..fa8abc8785 100644
--- a/protocols/JabberG/icos/rename.ico
+++ b/protocols/JabberG/res/rename.ico
Binary files differ
diff --git a/protocols/JabberG/icos/request.ico b/protocols/JabberG/res/request.ico
index 94ee8e60c3..94ee8e60c3 100644
--- a/protocols/JabberG/icos/request.ico
+++ b/protocols/JabberG/res/request.ico
Binary files differ
diff --git a/protocols/JabberG/icos/reset_filter.ico b/protocols/JabberG/res/reset_filter.ico
index e1e54dbeb6..e1e54dbeb6 100644
--- a/protocols/JabberG/icos/reset_filter.ico
+++ b/protocols/JabberG/res/reset_filter.ico
Binary files differ
diff --git a/protocols/JabberG/icos/roster.ico b/protocols/JabberG/res/roster.ico
index 89e9430443..89e9430443 100644
--- a/protocols/JabberG/icos/roster.ico
+++ b/protocols/JabberG/res/roster.ico
Binary files differ
diff --git a/protocols/JabberG/icos/rss.ico b/protocols/JabberG/res/rss.ico
index 9069672b7d..9069672b7d 100644
--- a/protocols/JabberG/icos/rss.ico
+++ b/protocols/JabberG/res/rss.ico
Binary files differ
diff --git a/protocols/JabberG/icos/save.ico b/protocols/JabberG/res/save.ico
index fadf04c4da..fadf04c4da 100644
--- a/protocols/JabberG/icos/save.ico
+++ b/protocols/JabberG/res/save.ico
Binary files differ
diff --git a/protocols/JabberG/icos/send_note.ico b/protocols/JabberG/res/send_note.ico
index c77fa5e35d..c77fa5e35d 100644
--- a/protocols/JabberG/icos/send_note.ico
+++ b/protocols/JabberG/res/send_note.ico
Binary files differ
diff --git a/protocols/JabberG/icos/server.ico b/protocols/JabberG/res/server.ico
index 1e4af66351..1e4af66351 100644
--- a/protocols/JabberG/icos/server.ico
+++ b/protocols/JabberG/res/server.ico
Binary files differ
diff --git a/protocols/JabberG/icos/service_discovery.ico b/protocols/JabberG/res/service_discovery.ico
index b361d5ab2a..b361d5ab2a 100644
--- a/protocols/JabberG/icos/service_discovery.ico
+++ b/protocols/JabberG/res/service_discovery.ico
Binary files differ
diff --git a/protocols/JabberG/icos/store.ico b/protocols/JabberG/res/store.ico
index 86efc4935e..86efc4935e 100644
--- a/protocols/JabberG/icos/store.ico
+++ b/protocols/JabberG/res/store.ico
Binary files differ
diff --git a/protocols/JabberG/icos/transport.ico b/protocols/JabberG/res/transport.ico
index 5082add068..5082add068 100644
--- a/protocols/JabberG/icos/transport.ico
+++ b/protocols/JabberG/res/transport.ico
Binary files differ
diff --git a/protocols/JabberG/icos/transport_local.ico b/protocols/JabberG/res/transport_local.ico
index c1b79901a2..c1b79901a2 100644
--- a/protocols/JabberG/icos/transport_local.ico
+++ b/protocols/JabberG/res/transport_local.ico
Binary files differ
diff --git a/protocols/JabberG/icos/user2room.ico b/protocols/JabberG/res/user2room.ico
index 94c37db75e..94c37db75e 100644
--- a/protocols/JabberG/icos/user2room.ico
+++ b/protocols/JabberG/res/user2room.ico
Binary files differ
diff --git a/protocols/JabberG/res/version.rc b/protocols/JabberG/res/version.rc
new file mode 100644
index 0000000000..d50daca899
--- /dev/null
+++ b/protocols/JabberG/res/version.rc
@@ -0,0 +1,53 @@
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "..\src\version.h"
+#include "winres.h"
+
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page( 1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "Comments", "\0"
+ VALUE "CompanyName", "Miranda\0"
+ VALUE "FileDescription", "Jabber Protocol Plugin for Miranda NG\0"
+ VALUE "FileVersion", __VERSION_STRING
+ VALUE "InternalName", "jabber\0"
+ VALUE "LegalCopyright", "Copyright ( c) 2002-04 Santithorn Bunchua, 2005 George Hazan \0"
+ VALUE "LegalTrademarks", "\0"
+ VALUE "OriginalFilename", "jabber.dll\0"
+ VALUE "PrivateBuild", "\0"
+ VALUE "ProductName", "Jabber Protocol Plugin for Miranda NG\0"
+ VALUE "ProductVersion", __VERSION_STRING
+ VALUE "SpecialBuild", "\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
diff --git a/protocols/JabberG/icos/view_as_list.ico b/protocols/JabberG/res/view_as_list.ico
index 6baf9d9d3d..6baf9d9d3d 100644
--- a/protocols/JabberG/icos/view_as_list.ico
+++ b/protocols/JabberG/res/view_as_list.ico
Binary files differ
diff --git a/protocols/JabberG/icos/view_as_tree.ico b/protocols/JabberG/res/view_as_tree.ico
index 0a1c408f34..0a1c408f34 100644
--- a/protocols/JabberG/icos/view_as_tree.ico
+++ b/protocols/JabberG/res/view_as_tree.ico
Binary files differ
diff --git a/protocols/JabberG/icos/weather.ico b/protocols/JabberG/res/weather.ico
index 6fa9c8f5a5..6fa9c8f5a5 100644
--- a/protocols/JabberG/icos/weather.ico
+++ b/protocols/JabberG/res/weather.ico
Binary files differ
diff --git a/protocols/JabberG/MString.cpp b/protocols/JabberG/src/MString.cpp
index 773871d1a5..773871d1a5 100644
--- a/protocols/JabberG/MString.cpp
+++ b/protocols/JabberG/src/MString.cpp
diff --git a/protocols/JabberG/MString.h b/protocols/JabberG/src/MString.h
index 7cc16ff4a3..7cc16ff4a3 100644
--- a/protocols/JabberG/MString.h
+++ b/protocols/JabberG/src/MString.h
diff --git a/protocols/JabberG/jabber.cpp b/protocols/JabberG/src/jabber.cpp
index a3dd31a3fa..a3dd31a3fa 100644
--- a/protocols/JabberG/jabber.cpp
+++ b/protocols/JabberG/src/jabber.cpp
diff --git a/protocols/JabberG/jabber.h b/protocols/JabberG/src/jabber.h
index 957b7d66bf..957b7d66bf 100644
--- a/protocols/JabberG/jabber.h
+++ b/protocols/JabberG/src/jabber.h
diff --git a/protocols/JabberG/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp
index 09884e79df..09884e79df 100644
--- a/protocols/JabberG/jabber_adhoc.cpp
+++ b/protocols/JabberG/src/jabber_adhoc.cpp
diff --git a/protocols/JabberG/jabber_agent.cpp b/protocols/JabberG/src/jabber_agent.cpp
index b0ad17e8a0..b0ad17e8a0 100644
--- a/protocols/JabberG/jabber_agent.cpp
+++ b/protocols/JabberG/src/jabber_agent.cpp
diff --git a/protocols/JabberG/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp
index 158f83e669..158f83e669 100644
--- a/protocols/JabberG/jabber_bookmarks.cpp
+++ b/protocols/JabberG/src/jabber_bookmarks.cpp
diff --git a/protocols/JabberG/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp
index 9e86b51388..9e86b51388 100644
--- a/protocols/JabberG/jabber_byte.cpp
+++ b/protocols/JabberG/src/jabber_byte.cpp
diff --git a/protocols/JabberG/jabber_byte.h b/protocols/JabberG/src/jabber_byte.h
index 657d797fce..657d797fce 100644
--- a/protocols/JabberG/jabber_byte.h
+++ b/protocols/JabberG/src/jabber_byte.h
diff --git a/protocols/JabberG/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp
index 380cf03087..380cf03087 100644
--- a/protocols/JabberG/jabber_caps.cpp
+++ b/protocols/JabberG/src/jabber_caps.cpp
diff --git a/protocols/JabberG/jabber_caps.h b/protocols/JabberG/src/jabber_caps.h
index e0525f2a16..e0525f2a16 100644
--- a/protocols/JabberG/jabber_caps.h
+++ b/protocols/JabberG/src/jabber_caps.h
diff --git a/protocols/JabberG/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp
index 88d3038ab7..88d3038ab7 100644
--- a/protocols/JabberG/jabber_captcha.cpp
+++ b/protocols/JabberG/src/jabber_captcha.cpp
diff --git a/protocols/JabberG/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 8dacc24619..8dacc24619 100644
--- a/protocols/JabberG/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
diff --git a/protocols/JabberG/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp
index ca2c82b3e4..ca2c82b3e4 100644
--- a/protocols/JabberG/jabber_console.cpp
+++ b/protocols/JabberG/src/jabber_console.cpp
diff --git a/protocols/JabberG/jabber_db_utils.h b/protocols/JabberG/src/jabber_db_utils.h
index ae9a6c9781..ae9a6c9781 100644
--- a/protocols/JabberG/jabber_db_utils.h
+++ b/protocols/JabberG/src/jabber_db_utils.h
diff --git a/protocols/JabberG/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index eadfd2d5d1..eadfd2d5d1 100644
--- a/protocols/JabberG/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
diff --git a/protocols/JabberG/jabber_disco.h b/protocols/JabberG/src/jabber_disco.h
index 79df12781e..79df12781e 100644
--- a/protocols/JabberG/jabber_disco.h
+++ b/protocols/JabberG/src/jabber_disco.h
diff --git a/protocols/JabberG/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp
index 3f416aa54b..3f416aa54b 100644
--- a/protocols/JabberG/jabber_events.cpp
+++ b/protocols/JabberG/src/jabber_events.cpp
diff --git a/protocols/JabberG/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp
index 5db215d024..5db215d024 100644
--- a/protocols/JabberG/jabber_file.cpp
+++ b/protocols/JabberG/src/jabber_file.cpp
diff --git a/protocols/JabberG/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp
index a90dcf62fa..a90dcf62fa 100644
--- a/protocols/JabberG/jabber_form.cpp
+++ b/protocols/JabberG/src/jabber_form.cpp
diff --git a/protocols/JabberG/jabber_form2.cpp b/protocols/JabberG/src/jabber_form2.cpp
index f1936c9e73..f1936c9e73 100644
--- a/protocols/JabberG/jabber_form2.cpp
+++ b/protocols/JabberG/src/jabber_form2.cpp
diff --git a/protocols/JabberG/jabber_form2.h b/protocols/JabberG/src/jabber_form2.h
index 051eb8571f..051eb8571f 100644
--- a/protocols/JabberG/jabber_form2.h
+++ b/protocols/JabberG/src/jabber_form2.h
diff --git a/protocols/JabberG/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index 4ded28d84d..4ded28d84d 100644
--- a/protocols/JabberG/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
diff --git a/protocols/JabberG/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp
index b442588fc0..b442588fc0 100644
--- a/protocols/JabberG/jabber_groupchat.cpp
+++ b/protocols/JabberG/src/jabber_groupchat.cpp
diff --git a/protocols/JabberG/jabber_ibb.cpp b/protocols/JabberG/src/jabber_ibb.cpp
index 51719a696b..51719a696b 100644
--- a/protocols/JabberG/jabber_ibb.cpp
+++ b/protocols/JabberG/src/jabber_ibb.cpp
diff --git a/protocols/JabberG/jabber_ibb.h b/protocols/JabberG/src/jabber_ibb.h
index 37ecfd1a2e..37ecfd1a2e 100644
--- a/protocols/JabberG/jabber_ibb.h
+++ b/protocols/JabberG/src/jabber_ibb.h
diff --git a/protocols/JabberG/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index f29a827313..f29a827313 100644
--- a/protocols/JabberG/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
diff --git a/protocols/JabberG/jabber_icolib.h b/protocols/JabberG/src/jabber_icolib.h
index 4b5f7d8e12..4b5f7d8e12 100644
--- a/protocols/JabberG/jabber_icolib.h
+++ b/protocols/JabberG/src/jabber_icolib.h
diff --git a/protocols/JabberG/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp
index 43084114c2..43084114c2 100644
--- a/protocols/JabberG/jabber_iq.cpp
+++ b/protocols/JabberG/src/jabber_iq.cpp
diff --git a/protocols/JabberG/jabber_iq.h b/protocols/JabberG/src/jabber_iq.h
index 6e145e7db0..6e145e7db0 100644
--- a/protocols/JabberG/jabber_iq.h
+++ b/protocols/JabberG/src/jabber_iq.h
diff --git a/protocols/JabberG/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index 7f3385ff6e..7f3385ff6e 100644
--- a/protocols/JabberG/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
diff --git a/protocols/JabberG/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp
index 7679450d59..7679450d59 100644
--- a/protocols/JabberG/jabber_iqid.cpp
+++ b/protocols/JabberG/src/jabber_iqid.cpp
diff --git a/protocols/JabberG/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp
index 3621506d29..3621506d29 100644
--- a/protocols/JabberG/jabber_iqid_muc.cpp
+++ b/protocols/JabberG/src/jabber_iqid_muc.cpp
diff --git a/protocols/JabberG/jabber_libstr.cpp b/protocols/JabberG/src/jabber_libstr.cpp
index 4517d77272..4517d77272 100644
--- a/protocols/JabberG/jabber_libstr.cpp
+++ b/protocols/JabberG/src/jabber_libstr.cpp
diff --git a/protocols/JabberG/jabber_list.cpp b/protocols/JabberG/src/jabber_list.cpp
index 8a956ebc47..8a956ebc47 100644
--- a/protocols/JabberG/jabber_list.cpp
+++ b/protocols/JabberG/src/jabber_list.cpp
diff --git a/protocols/JabberG/jabber_list.h b/protocols/JabberG/src/jabber_list.h
index 503a479ece..503a479ece 100644
--- a/protocols/JabberG/jabber_list.h
+++ b/protocols/JabberG/src/jabber_list.h
diff --git a/protocols/JabberG/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp
index 6bc4c1f8c8..6bc4c1f8c8 100644
--- a/protocols/JabberG/jabber_menu.cpp
+++ b/protocols/JabberG/src/jabber_menu.cpp
diff --git a/protocols/JabberG/jabber_message_handlers.cpp b/protocols/JabberG/src/jabber_message_handlers.cpp
index a3801f274f..a3801f274f 100644
--- a/protocols/JabberG/jabber_message_handlers.cpp
+++ b/protocols/JabberG/src/jabber_message_handlers.cpp
diff --git a/protocols/JabberG/jabber_message_manager.cpp b/protocols/JabberG/src/jabber_message_manager.cpp
index 67e9982eb3..67e9982eb3 100644
--- a/protocols/JabberG/jabber_message_manager.cpp
+++ b/protocols/JabberG/src/jabber_message_manager.cpp
diff --git a/protocols/JabberG/jabber_message_manager.h b/protocols/JabberG/src/jabber_message_manager.h
index dd52b50683..dd52b50683 100644
--- a/protocols/JabberG/jabber_message_manager.h
+++ b/protocols/JabberG/src/jabber_message_manager.h
diff --git a/protocols/JabberG/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index e13c0d450d..e13c0d450d 100644
--- a/protocols/JabberG/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
diff --git a/protocols/JabberG/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp
index d684541f0a..d684541f0a 100644
--- a/protocols/JabberG/jabber_notes.cpp
+++ b/protocols/JabberG/src/jabber_notes.cpp
diff --git a/protocols/JabberG/jabber_notes.h b/protocols/JabberG/src/jabber_notes.h
index de096943c2..de096943c2 100644
--- a/protocols/JabberG/jabber_notes.h
+++ b/protocols/JabberG/src/jabber_notes.h
diff --git a/protocols/JabberG/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp
index 1f1270a8a1..1f1270a8a1 100644
--- a/protocols/JabberG/jabber_opt.cpp
+++ b/protocols/JabberG/src/jabber_opt.cpp
diff --git a/protocols/JabberG/jabber_opttree.cpp b/protocols/JabberG/src/jabber_opttree.cpp
index bd43b55a08..bd43b55a08 100644
--- a/protocols/JabberG/jabber_opttree.cpp
+++ b/protocols/JabberG/src/jabber_opttree.cpp
diff --git a/protocols/JabberG/jabber_opttree.h b/protocols/JabberG/src/jabber_opttree.h
index 3246ad74a3..3246ad74a3 100644
--- a/protocols/JabberG/jabber_opttree.h
+++ b/protocols/JabberG/src/jabber_opttree.h
diff --git a/protocols/JabberG/jabber_password.cpp b/protocols/JabberG/src/jabber_password.cpp
index 2ce5128b78..2ce5128b78 100644
--- a/protocols/JabberG/jabber_password.cpp
+++ b/protocols/JabberG/src/jabber_password.cpp
diff --git a/protocols/JabberG/jabber_presence_manager.cpp b/protocols/JabberG/src/jabber_presence_manager.cpp
index 8a8ece811d..8a8ece811d 100644
--- a/protocols/JabberG/jabber_presence_manager.cpp
+++ b/protocols/JabberG/src/jabber_presence_manager.cpp
diff --git a/protocols/JabberG/jabber_presence_manager.h b/protocols/JabberG/src/jabber_presence_manager.h
index be138d3b93..be138d3b93 100644
--- a/protocols/JabberG/jabber_presence_manager.h
+++ b/protocols/JabberG/src/jabber_presence_manager.h
diff --git a/protocols/JabberG/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 636cf50bf6..636cf50bf6 100644
--- a/protocols/JabberG/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
diff --git a/protocols/JabberG/jabber_privacy.h b/protocols/JabberG/src/jabber_privacy.h
index 4a2cfd8f2f..4a2cfd8f2f 100644
--- a/protocols/JabberG/jabber_privacy.h
+++ b/protocols/JabberG/src/jabber_privacy.h
diff --git a/protocols/JabberG/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 6444482ee6..6444482ee6 100644
--- a/protocols/JabberG/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
diff --git a/protocols/JabberG/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index eff59bb002..eff59bb002 100644
--- a/protocols/JabberG/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
diff --git a/protocols/JabberG/jabber_proxy.cpp b/protocols/JabberG/src/jabber_proxy.cpp
index 1702eb52de..1702eb52de 100644
--- a/protocols/JabberG/jabber_proxy.cpp
+++ b/protocols/JabberG/src/jabber_proxy.cpp
diff --git a/protocols/JabberG/jabber_proxy.h b/protocols/JabberG/src/jabber_proxy.h
index a42591f81e..a42591f81e 100644
--- a/protocols/JabberG/jabber_proxy.h
+++ b/protocols/JabberG/src/jabber_proxy.h
diff --git a/protocols/JabberG/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index 0021733356..0021733356 100644
--- a/protocols/JabberG/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
diff --git a/protocols/JabberG/jabber_rc.h b/protocols/JabberG/src/jabber_rc.h
index cb3bf1b9cc..cb3bf1b9cc 100644
--- a/protocols/JabberG/jabber_rc.h
+++ b/protocols/JabberG/src/jabber_rc.h
diff --git a/protocols/JabberG/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp
index e242294a16..e242294a16 100644
--- a/protocols/JabberG/jabber_search.cpp
+++ b/protocols/JabberG/src/jabber_search.cpp
diff --git a/protocols/JabberG/jabber_search.h b/protocols/JabberG/src/jabber_search.h
index 7450b652d1..7450b652d1 100644
--- a/protocols/JabberG/jabber_search.h
+++ b/protocols/JabberG/src/jabber_search.h
diff --git a/protocols/JabberG/jabber_secur.cpp b/protocols/JabberG/src/jabber_secur.cpp
index c48ded22d6..c48ded22d6 100644
--- a/protocols/JabberG/jabber_secur.cpp
+++ b/protocols/JabberG/src/jabber_secur.cpp
diff --git a/protocols/JabberG/jabber_secur.h b/protocols/JabberG/src/jabber_secur.h
index 0c3287b88d..0c3287b88d 100644
--- a/protocols/JabberG/jabber_secur.h
+++ b/protocols/JabberG/src/jabber_secur.h
diff --git a/protocols/JabberG/jabber_send_manager.cpp b/protocols/JabberG/src/jabber_send_manager.cpp
index b37b1d2f09..b37b1d2f09 100644
--- a/protocols/JabberG/jabber_send_manager.cpp
+++ b/protocols/JabberG/src/jabber_send_manager.cpp
diff --git a/protocols/JabberG/jabber_send_manager.h b/protocols/JabberG/src/jabber_send_manager.h
index fe4916686f..fe4916686f 100644
--- a/protocols/JabberG/jabber_send_manager.h
+++ b/protocols/JabberG/src/jabber_send_manager.h
diff --git a/protocols/JabberG/jabber_std.cpp b/protocols/JabberG/src/jabber_std.cpp
index 099c28b993..099c28b993 100644
--- a/protocols/JabberG/jabber_std.cpp
+++ b/protocols/JabberG/src/jabber_std.cpp
diff --git a/protocols/JabberG/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index 6344751ead..6344751ead 100644
--- a/protocols/JabberG/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
diff --git a/protocols/JabberG/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index d71fd2ab60..d71fd2ab60 100644
--- a/protocols/JabberG/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
diff --git a/protocols/JabberG/jabber_treelist.cpp b/protocols/JabberG/src/jabber_treelist.cpp
index 8e1e28cb45..8e1e28cb45 100644
--- a/protocols/JabberG/jabber_treelist.cpp
+++ b/protocols/JabberG/src/jabber_treelist.cpp
diff --git a/protocols/JabberG/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index 9d8b476851..9d8b476851 100644
--- a/protocols/JabberG/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
diff --git a/protocols/JabberG/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index a7650c5cd0..a7650c5cd0 100644
--- a/protocols/JabberG/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
diff --git a/protocols/JabberG/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp
index 691f3516ed..691f3516ed 100644
--- a/protocols/JabberG/jabber_vcard.cpp
+++ b/protocols/JabberG/src/jabber_vcard.cpp
diff --git a/protocols/JabberG/jabber_ws.cpp b/protocols/JabberG/src/jabber_ws.cpp
index 494dcf3454..494dcf3454 100644
--- a/protocols/JabberG/jabber_ws.cpp
+++ b/protocols/JabberG/src/jabber_ws.cpp
diff --git a/protocols/JabberG/jabber_xml.cpp b/protocols/JabberG/src/jabber_xml.cpp
index 287a335243..287a335243 100644
--- a/protocols/JabberG/jabber_xml.cpp
+++ b/protocols/JabberG/src/jabber_xml.cpp
diff --git a/protocols/JabberG/jabber_xml.h b/protocols/JabberG/src/jabber_xml.h
index 0a1b41e511..0a1b41e511 100644
--- a/protocols/JabberG/jabber_xml.h
+++ b/protocols/JabberG/src/jabber_xml.h
diff --git a/protocols/JabberG/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index d15cae2bcd..d15cae2bcd 100644
--- a/protocols/JabberG/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
diff --git a/protocols/JabberG/jabber_xstatus.h b/protocols/JabberG/src/jabber_xstatus.h
index ae12ebae86..ae12ebae86 100644
--- a/protocols/JabberG/jabber_xstatus.h
+++ b/protocols/JabberG/src/jabber_xstatus.h
diff --git a/protocols/JabberG/jabber_zstream.cpp b/protocols/JabberG/src/jabber_zstream.cpp
index 11829bf401..11829bf401 100644
--- a/protocols/JabberG/jabber_zstream.cpp
+++ b/protocols/JabberG/src/jabber_zstream.cpp
diff --git a/protocols/JabberG/resource.h b/protocols/JabberG/src/resource.h
index 5cbc583aa5..5cbc583aa5 100644
--- a/protocols/JabberG/resource.h
+++ b/protocols/JabberG/src/resource.h
diff --git a/protocols/JabberG/ui_utils.cpp b/protocols/JabberG/src/ui_utils.cpp
index 39f63ecae7..39f63ecae7 100644
--- a/protocols/JabberG/ui_utils.cpp
+++ b/protocols/JabberG/src/ui_utils.cpp
diff --git a/protocols/JabberG/ui_utils.h b/protocols/JabberG/src/ui_utils.h
index 9af9e8ba36..9af9e8ba36 100644
--- a/protocols/JabberG/ui_utils.h
+++ b/protocols/JabberG/src/ui_utils.h
diff --git a/protocols/JabberG/version.h b/protocols/JabberG/src/version.h
index cf7a422dc2..cf7a422dc2 100644
--- a/protocols/JabberG/version.h
+++ b/protocols/JabberG/src/version.h
diff --git a/protocols/JabberG/version.rc b/protocols/JabberG/version.rc
deleted file mode 100644
index 675df2f720..0000000000
--- a/protocols/JabberG/version.rc
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifdef APSTUDIO_INVOKED
-#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-#include "version.h"
-#include "resource.h"
-#include "winres.h"
-#include "richedit.h"
-
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page( 1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Do not edit this dialogs in visual editor!!!
-//
-
-IDD_CONSOLE DIALOGEX 0, 0, 354, 240
-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_CONTROLPARENT
-CAPTION "XML Console"
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- CONTROL "",IDC_CONSOLE,RICHEDIT_CLASS,WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x804,5,5,343,137
- CONTROL "Custom1",IDC_BTN_MSG,"MButtonClass",WS_TABSTOP,5,147,16,14
- CONTROL "Custom1",IDC_BTN_PRESENCE,"MButtonClass",WS_TABSTOP,21,147,16,14
- CONTROL "Custom1",IDC_BTN_IQ,"MButtonClass",WS_TABSTOP,37,147,16,14
- CONTROL "Custom1",IDC_BTN_FILTER,"MButtonClass",WS_TABSTOP,68,147,16,14
- COMBOBOX IDC_CB_FILTER,86,147,245,91,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
- CONTROL "Custom1",IDC_BTN_FILTER_REFRESH,"MButtonClass",WS_TABSTOP,333,147,16,14
- EDITTEXT IDC_CONSOLEIN,5,166,343,38,ES_MULTILINE | WS_VSCROLL
- PUSHBUTTON "Reset log",IDC_RESET,244,209,50,14
- DEFPUSHBUTTON "Send",IDOK,299,209,50,14
-END
-
-IDD_GROUPCHAT_INPUT DIALOGEX 0, 0, 242, 42
-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
-EXSTYLE WS_EX_CONTROLPARENT
-FONT 8, "MS Shell Dlg", 0, 0, 0x1
-BEGIN
- EDITTEXT IDC_TXT_MULTILINE,6,6,230,12,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | NOT WS_VISIBLE | WS_VSCROLL
- EDITTEXT IDC_TXT_PASSWORD,6,6,230,12,ES_AUTOHSCROLL | NOT WS_VISIBLE | ES_PASSWORD
- COMBOBOX IDC_TXT_COMBO,6,6,230,92,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
- CONTROL "",IDC_TXT_RICHEDIT,RICHEDIT_CLASS,NOT WS_VISIBLE | WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x1004,6,6,230,12
- DEFPUSHBUTTON "OK",IDOK,131,23,50,14
- PUSHBUTTON "Cancel",IDCANCEL,186,23,50,14
-END
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION __FILEVERSION_STRING
- PRODUCTVERSION __FILEVERSION_STRING
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "Comments", "\0"
- VALUE "CompanyName", "Miranda\0"
- VALUE "FileDescription", "Jabber Protocol Plugin for Miranda NG\0"
- VALUE "FileVersion", __VERSION_STRING
- VALUE "InternalName", "jabber\0"
- VALUE "LegalCopyright", "Copyright ( c) 2002-04 Santithorn Bunchua, 2005 George Hazan \0"
- VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "jabber.dll\0"
- VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Jabber Protocol Plugin for Miranda NG\0"
- VALUE "ProductVersion", __VERSION_STRING
- VALUE "SpecialBuild", "\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif // !_MAC