[empathy] (26 commits) ...Merge branch 'trivia'

[Guillaume Desmottes <gdesmott src gnome org>]

Summary of changes:

  5c830b1... empathy-account-widget.c: fix uint comparaison
  28c32ab... empathy-avatar-chooser.c: fix casting issues
  c5c492f... empathy-avatar-image.c: fix a casting issue
  812da36... empathy-chat-text-view.c: fix shadow declarations and uint 
  dd2c71f... empathy-contact-widget.c: fix shadow declarations
  e007409... empathy-status-preset-dialog: fix uint comparaisons
  b4d5fc6... empathy-theme-adium.c: fix uint comparaisons
  05f02c1... empathy-theme-boxes.c: fix shadow declarations
  c77666d... empathy-theme-manager.c: fix shadow declarations
  6275428... empathy-ui-utils.c: fix shadow declaration
  17c8536... totem-subtitle-encoding.c: fix shadow declarations
  5f6e2d5... empathy-nautilus-sendto.c: fix shadow declaration
  d5a1765... empathy-account-settings.c: fix uint comparaison
  d55286d... empathy-chatroom-manager.c: fix casting issues
  73ae73a... empathy-connection-managers.c: fix shadow declarations
  3dcd2bd... empathy-contact-groups.c: fix casting issues
  fc4c32d... empathy-dispatcher.c: fix shadow declarations
  06788aa... empathy-irc-network-manager.c: fix casting issues
  d3ebcb8... empathy-log-store-empathy.c: fix casting issues
  80dac46... empathy-status-presets.c: fix casting issues
  1f391b9... empathy-time.c: fix shadow declaration
  a691a12... empathy-tp-contact-factory.c: fix casting issue
  6e414d1... empathy-tp-contact-list.c: fix shadow declaration and uint 
  74f0c71... empathy-utils.c: fix casting issues
  a28c3a4... empathy-avatar-chooser.c: fix identation
  6843cf0... Merge branch 'trivia'