[gnome-panel: 135/136] Merge branch 'gtk3'

[Vincent Untz <vuntz src gnome org>]

commit 4d98bcf724b83846e9457d55bc8d2c51a36f46e2
Merge: a7d21dc cef832d
Author: Vincent Untz <vuntz gnome org>
Date:   Tue Feb 1 00:52:55 2011 +0100

    Merge branch 'gtk3'
    
    Conflicts:
    	applets/notification_area/Makefile.am
    	configure.ac

 Makefile.am                                        |    3 +-
 applets/clock/Makefile.am                          |    8 +-
 applets/clock/calendar-window.c                    |   95 ++--
 applets/clock/clock-face.c                         |  168 +++---
 applets/clock/clock-face.h                         |    2 +
 applets/clock/clock-location-tile.c                |   13 -
 applets/clock/clock-location.c                     |    3 +-
 applets/clock/clock-location.h                     |    1 -
 applets/clock/clock-map.c                          |   99 ++--
 applets/clock/clock.c                              |   97 ++--
 applets/fish/Makefile.am                           |    8 +-
 applets/fish/fish.c                                |  170 +++---
 applets/notification_area/Makefile.am              |   17 +-
 applets/notification_area/fixedtip.c               |   43 +-
 applets/notification_area/main.c                   |   36 +-
 applets/notification_area/na-tray-child.c          |   81 ++--
 applets/notification_area/na-tray-child.h          |    2 +-
 applets/notification_area/na-tray-manager.c        |   18 +-
 applets/notification_area/na-tray.c                |   75 ++--
 applets/notification_area/testtray.c               |    6 +-
 applets/wncklet/Makefile.am                        |    9 +-
 applets/wncklet/showdesktop.c                      |   48 +-
 applets/wncklet/window-list.c                      |   43 +-
 applets/wncklet/window-menu.c                      |   95 ++--
 applets/wncklet/wncklet.c                          |    3 +-
 applets/wncklet/wncklet.h                          |    3 +-
 applets/wncklet/workspace-switcher.c               |   37 +-
 bonobo/libpanel-applet/Makefile.am                 |    2 +-
 configure.ac                                       |   62 ++-
 doc/reference/panel-applet/Makefile.am             |    3 +-
 .../panel-applet/tmpl/panel-applet-unused.sgml     |   12 +
 doc/reference/panel-applet/tmpl/panel-applet.sgml  |   17 +-
 gnome-panel/Makefile.am                            |    7 +-
 gnome-panel/applet.c                               |   12 +-
 gnome-panel/button-widget.c                        |  296 +++++------
 gnome-panel/drawer.c                               |   20 +-
 gnome-panel/gnome-panelrc                          |    4 -
 gnome-panel/libegg/eggdesktopfile.c                |   10 +
 gnome-panel/libegg/eggdesktopfile.h                |    3 +
 gnome-panel/libegg/eggsmclient-private.h           |    6 +
 gnome-panel/libegg/eggsmclient-xsmp.c              |    5 +
 .../panel-applet-container.c                       |    1 +
 gnome-panel/libpanel-util/panel-icon-chooser.c     |    7 +-
 gnome-panel/libpanel-util/panel-launch.c           |   29 +-
 gnome-panel/menu.c                                 |  117 +++--
 gnome-panel/nothing.cP                             |  134 ++---
 gnome-panel/panel-action-button.c                  |   30 +-
 gnome-panel/panel-action-protocol.c                |    7 +-
 gnome-panel/panel-addto.c                          |   14 +-
 gnome-panel/panel-applet-frame.c                   |  138 +++--
 gnome-panel/panel-background-monitor.c             |   76 +--
 gnome-panel/panel-background.c                     |  587 ++++++++------------
 gnome-panel/panel-background.h                     |   29 +-
 gnome-panel/panel-context-menu.c                   |    4 +-
 gnome-panel/panel-ditem-editor.c                   |   10 +-
 gnome-panel/panel-force-quit.c                     |   45 ++-
 gnome-panel/panel-frame.c                          |  286 ++++++----
 gnome-panel/panel-frame.h                          |    1 +
 gnome-panel/panel-menu-bar.c                       |   65 ++-
 gnome-panel/panel-menu-button.c                    |    4 +-
 gnome-panel/panel-multiscreen.c                    |    2 +-
 gnome-panel/panel-profile.c                        |  159 +++---
 gnome-panel/panel-profile.h                        |   12 +-
 gnome-panel/panel-properties-dialog.c              |   33 +-
 gnome-panel/panel-properties-dialog.ui             |    2 -
 gnome-panel/panel-run-dialog.c                     |   93 ++--
 gnome-panel/panel-run-dialog.ui                    |    4 +-
 gnome-panel/panel-separator.c                      |  110 +++--
 gnome-panel/panel-session.c                        |    4 +-
 gnome-panel/panel-test-applets.ui                  |    1 -
 gnome-panel/panel-toplevel.c                       |  404 ++++++++------
 gnome-panel/panel-types.h                          |    5 -
 gnome-panel/panel-util.c                           |   23 +-
 gnome-panel/panel-widget.c                         |  237 +++++----
 gnome-panel/panel-xutils.c                         |   12 +-
 gnome-panel/panel.c                                |   15 +-
 gnome-panel/xstuff.c                               |   58 +--
 gnome-panel/xstuff.h                               |    1 -
 libpanel-applet/Makefile.am                        |   36 +-
 .../libpanelapplet-3.0-uninstalled.pc.in           |   11 -
 libpanel-applet/libpanelapplet-3.0.pc.in           |   11 -
 libpanel-applet/libpanelapplet-uninstalled.pc.in   |   13 +
 libpanel-applet/libpanelapplet.pc.in               |   16 +
 libpanel-applet/panel-applet-marshal.list          |    4 -
 libpanel-applet/panel-applet.c                     |  601 ++++++++++----------
 libpanel-applet/panel-applet.h                     |   18 +-
 libpanel-applet/test-dbus-applet.c                 |   23 +-
 87 files changed, 2603 insertions(+), 2531 deletions(-)
---