[gnome-applets/wip/dont-use-deprecated: 85/87] Merge master into wip

[Enrico Minack <eminack src gnome org>]

commit 978397bee2c270b82768d5042faaa10a2952370c
Merge: 52564a5 8935df7
Author: Enrico Minack <enrico-minack gmx de>
Date:   Fri Apr 1 19:26:36 2011 -0400

    Merge master into wip

 NEWS                                       |    8 +
 accessx-status/Makefile.am                 |   15 +-
 accessx-status/applet.c                    |  153 +-
 battstat/Makefile.am                       |    9 +-
 battstat/acpi-linux.c                      |    2 +-
 battstat/battstat.h                        |    3 -
 battstat/battstat_applet.c                 |  225 +-
 battstat/properties.c                      |    1 -
 charpick/Makefile.am                       |    8 +-
 charpick/charpick.c                        |   21 +-
 charpick/properties.c                      |    4 +-
 configure.in                               |   61 +-
 cpufreq/Makefile.am                        |    4 +-
 cpufreq/src/Makefile.am                    |    9 +-
 cpufreq/src/cpufreq-applet.c               |   93 +-
 drivemount/Makefile.am                     |   11 +-
 drivemount/drive-button.c                  |   70 +-
 drivemount/drive-list.c                    |   12 +-
 drivemount/drivemount.c                    |   24 +-
 geyes/Makefile.am                          |    8 +-
 geyes/geyes.c                              |   55 +-
 geyes/themes.c                             |    3 -
 gswitchit/help/Makefile.am                 |    2 +-
 gswitchit/help/da/da.po                    |  480 +++
 gweather/Makefile.am                       |   15 +-
 gweather/gweather-applet.c                 |   22 +-
 gweather/gweather-dialog.c                 |    1 -
 gweather/gweather-pref.c                   |   55 +-
 gweather/main.c                            |    1 -
 invest-applet/docs/Makefile.am             |    2 +-
 invest-applet/docs/de/de.po                |  295 ++-
 invest-applet/docs/fr/fr.po                |  866 ++++++
 invest-applet/invest/chart.py              |    2 +-
 invest-applet/invest/quotes.py             |    5 +-
 mini-commander/src/Makefile.am             |    6 +-
 mini-commander/src/command_line.c          |    4 +-
 mini-commander/src/mini-commander_applet.c |    1 -
 mixer/Makefile.am                          |    9 +-
 mixer/applet.c                             |    1 -
 mixer/load.c                               |    1 -
 modemlights/Makefile.am                    |    7 +-
 modemlights/modem-applet.c                 |    1 -
 multiload/Makefile.am                      |   12 +-
 multiload/global.h                         |    4 +-
 multiload/linux-proc.c                     |    1 -
 multiload/load-graph.c                     |  115 +-
 multiload/main.c                           |   63 +-
 multiload/properties.c                     |    3 -
 null_applet/Makefile.am                    |    6 +-
 null_applet/null_applet.c                  |    1 -
 po/bg.po                                   |  604 ++--
 po/cs.po                                   |  594 ++--
 po/eo.po                                   | 1563 +++++-----
 po/es.po                                   | 1069 ++++----
 po/et.po                                   |  297 +-
 po/fa.po                                   | 4515 +++++++++++++---------------
 po/fr.po                                   | 1095 ++++----
 po/gl.po                                   | 1070 ++++----
 po/he.po                                   | 1064 ++++----
 po/hu.po                                   |  656 +++--
 po/id.po                                   | 1054 ++++----
 po/lv.po                                   | 1292 ++++----
 po/nb.po                                   | 1080 ++++----
 po/pl.po                                   |  547 ++--
 po/pt_BR.po                                |  548 ++--
 po/sl.po                                   | 1202 ++++----
 po/sv.po                                   | 1146 ++++----
 po/th.po                                   |  311 ++-
 po/ug.po                                   |   28 +-
 po/zh_CN.po                                | 1406 +++++----
 po/zh_HK.po                                |   25 +-
 po/zh_TW.po                                |   25 +-
 stickynotes/Makefile.am                    |   10 +-
 stickynotes/stickynotes.c                  |   15 +-
 stickynotes/stickynotes_applet.c           |    8 +-
 stickynotes/stickynotes_applet_callbacks.c |   72 +-
 stickynotes/stickynotes_applet_callbacks.h |    5 -
 stickynotes/util.c                         |    6 +-
 trashapplet/Makefile.am                    |    4 +-
 trashapplet/docs/Makefile.am               |    2 +-
 trashapplet/docs/ro/ro.po                  |  350 +++
 trashapplet/src/Makefile.am                |   10 +-
 trashapplet/src/trash-empty.c              |   14 +-
 trashapplet/src/trashapplet.c              |   27 +-
 trashapplet/src/xstuff.c                   |   42 +-
 trashapplet/src/xstuff.h                   |    1 -
 86 files changed, 12988 insertions(+), 11549 deletions(-)
---
diff --cc configure.in
index eca3982,dae8381..7dddeaf
--- a/configure.in
+++ b/configure.in
@@@ -25,12 -25,13 +25,11 @@@ LIBNOTIFY_REQUIRED=0.
  HAL_REQUIRED=0.5.3
  DBUS_REQUIRED=1.1.2
  DBUS_GLIB_REQUIRED=0.74
 -PYGTK_REQUIRED=2.6
 -PYGOBJECT_REQUIRED=2.6
 -GNOME_PYTHON_REQUIRED=2.10
 +PYGOBJECT_REQUIRED=2.26
  GNOME_ICON_THEME_REQUIRED=2.15.91
  LIBXML_REQUIRED=2.5.0
- GWEATHER_REQUIRED=2.22.1
- GUCHARMAP2_REQUIRED=2.23.0
- GUCHARMAP_REQUIRED=1.4.0
+ GWEATHER_REQUIRED=2.91.0
+ GUCHARMAP3_REQUIRED=2.33.0
  POLKIT_REQUIRED=0.92
  NETWORKMANAGER_REQUIRED=0.7
  GST10_REQUIRED=0.10.2
diff --cc null_applet/Makefile.am
index b072b04,64ced1c..5db3de9
--- a/null_applet/Makefile.am
+++ b/null_applet/Makefile.am
@@@ -9,10 -10,10 +10,9 @@@ INCLUDES = 			
  libexec_PROGRAMS = null_applet
  
  null_applet_SOURCES = null_applet.c null_applet.h
--
 -null_applet_LDADD = $(GNOME_APPLETS_LIBS)
 +null_applet_LDADD = $(GNOME_APPLETS3_LIBS)
  
- appletdir = $(datadir)/gnome-panel/applets
+ appletdir = $(LIBPANEL_APPLET_DIR)
  applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
  
  $(applet_in_files): $(applet_in_files).in Makefile