[gnome-panel/bonobo-less: 90/93] Merge branch 'master' into bonobo-less
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/bonobo-less: 90/93] Merge branch 'master' into bonobo-less
- Date: Wed, 26 May 2010 08:33:50 +0000 (UTC)
commit 4ec6c71ffbea8c3ee2702aa7bdb2805863bc22c4
Merge: d5d4824 76aef11
Author: Vincent Untz <vuntz gnome org>
Date: Tue May 25 09:35:21 2010 +0200
Merge branch 'master' into bonobo-less
NEWS | 137 +
README | 2 +-
applets/clock/clock-location-tile.c | 8 +-
applets/clock/clock.c | 55 +-
applets/fish/fish.c | 2 +-
applets/notification_area/na-tray-child.c | 93 +-
applets/notification_area/na-tray-child.h | 17 +-
applets/notification_area/na-tray-manager.c | 2 +-
applets/notification_area/na-tray.c | 108 +-
applets/notification_area/testtray.c | 2 +-
applets/wncklet/window-menu.c | 2 +-
configure.in | 47 +-
gnome-panel/applet.c | 8 +-
gnome-panel/button-widget.c | 10 +-
gnome-panel/drawer.c | 2 +-
gnome-panel/libpanel-util/panel-icon-chooser.c | 2 +-
gnome-panel/menu.c | 28 +-
gnome-panel/nothing.cP | 98 +-
gnome-panel/panel-applet-frame.c | 12 +-
gnome-panel/panel-context-menu.c | 46 +-
gnome-panel/panel-ditem-editor.c | 4 +-
gnome-panel/panel-frame.c | 8 +-
gnome-panel/panel-icon-names.h | 7 +
gnome-panel/panel-menu-bar.c | 2 +-
gnome-panel/panel-menu-button.c | 1 -
gnome-panel/panel-menu-items.c | 6 +-
gnome-panel/panel-separator.c | 2 +-
gnome-panel/panel-struts.c | 4 +-
gnome-panel/panel-toplevel.c | 34 +-
gnome-panel/panel-util.c | 25 +
gnome-panel/panel-widget.c | 22 +-
gnome-panel/panel.c | 7 +
gnome-panel/xstuff.c | 2 +-
help/clock/C/clock.xml | 2 +-
help/clock/Makefile.am | 2 +-
help/clock/cs/cs.po | 412 ++-
help/clock/cs/figures/clock_applet.png | Bin 0 -> 879 bytes
help/clock/da/da.po | 403 ++-
help/clock/de/de.po | 171 +-
help/clock/el/el.po | 688 +++---
help/clock/es/es.po | 31 +-
help/clock/fr/fr.po | 379 ++-
help/clock/zh_HK/zh_HK.po | 659 +++++
help/clock/zh_TW/zh_TW.po | 566 +++--
help/fish/el/el.po | 19 +-
libpanel-applet/panel-applet.c | 18 +-
po/af.po | 2108 ++++++++-------
po/ar.po | 349 ++--
po/be.po | 2 +-
po/bn.po | 1072 +++++---
po/br.po | 1788 +++++++------
po/ca.po | 490 ++--
po/ca valencia po | 517 ++--
po/crh.po | 557 +++--
po/cs.po | 106 +-
po/da.po | 465 ++--
po/de.po | 51 +-
po/el.po | 1487 +++++++---
po/en shaw po | 2055 ++++++++++----
po/en_GB.po | 445 ++--
po/eu.po | 548 ++--
po/fi.po | 765 +++---
po/gu.po | 239 +-
po/hi.po | 108 +-
po/hu.po | 226 +-
po/hy.po | 3616 +++++++++++++-----------
po/id.po | 3052 +++++++++-----------
po/it.po | 617 +++--
po/ja.po | 500 ++--
po/kn.po | 780 +++---
po/ko.po | 474 ++--
po/lt.po | 452 ++--
po/lv.po | 1896 +++++++------
po/mg.po | 2267 ++++++++++-----
po/ml.po | 1162 ++++----
po/mr.po | 1297 +++++----
po/nb.po | 148 +-
po/nl.po | 1185 +++++----
po/nn.po | 1014 ++++----
po/pa.po | 595 +++--
po/pl.po | 108 +-
po/pt.po | 469 ++--
po/ru.po | 769 ++----
po/sk.po | 1216 +++++----
po/sr.po | 601 +++--
po/sr latin po | 601 +++--
po/uk.po | 560 +++--
87 files changed, 23546 insertions(+), 17366 deletions(-)
---
diff --cc configure.in
index de67b0a,32e19e0..70ace27
--- a/configure.in
+++ b/configure.in
@@@ -37,13 -37,9 +37,13 @@@ AC_PATH_PROG(GCONFTOOL, gconftool-2
GNOME_COMPILE_WARNINGS(maximum)
+m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
+PANEL_INTLTOOL_PANEL_APPLET_RULE='%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+AC_SUBST([PANEL_INTLTOOL_PANEL_APPLET_RULE])
+
AC_ARG_ENABLE(deprecations,
[AC_HELP_STRING([--enable-deprecations],
- [warn about deprecated usages [default=no]])],,
+ [warn about deprecated usages @<:@default=no@:>@])],,
[enable_deprecations=no])
if test "x$enable_deprecations" = "xyes"; then
@@@ -57,8 -53,10 +57,8 @@@ AC_CHECK_FUNCS(_NSGetEnviron
LIBGNOME_DESKTOP_REQUIRED=2.24.0
GDK_PIXBUF_REQUIRED=2.7.1
PANGO_REQUIRED=1.15.4
-GLIB_REQUIRED=2.18.0
+GLIB_REQUIRED=2.25.5
- GTK_REQUIRED=2.15.1
+ GTK_REQUIRED=2.19.7
-LIBBONOBOUI_REQUIRED=2.1.1
-ORBIT_REQUIRED=2.4.0
LIBWNCK_REQUIRED=2.19.5
GCONF_REQUIRED=2.6.1
LIBGNOME_MENU_REQUIRED=2.27.92
@@@ -259,10 -262,21 +264,13 @@@ dnl X RANDR extensio
if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then
AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
+ have_randr=yes
+ else
+ have_randr=no
fi
-dnl IDL directories
-
-ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-AC_SUBST(ORBIT_IDL)
-
-BONOBO_IDLDIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-AC_SUBST(BONOBO_IDLDIR)
-
-BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-AC_SUBST(BONOBO_ACT_IDLDIR)
+dnl Applets dir
+AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/applets")
dnl Language Support
diff --cc gnome-panel/panel-widget.c
index dd2549e,cfdc8c5..6e605a7
--- a/gnome-panel/panel-widget.c
+++ b/gnome-panel/panel-widget.c
@@@ -2584,10 -2584,10 +2584,10 @@@ panel_widget_reparent (PanelWidget *old
focus_widget = gtk_window_get_focus (GTK_WINDOW (old_panel->toplevel));
gtk_widget_reparent (applet, GTK_WIDGET (new_panel));
- if (info && info->type == PANEL_OBJECT_BONOBO)
+ if (info && info->type == PANEL_OBJECT_APPLET)
panel_applet_frame_set_panel (PANEL_APPLET_FRAME (ad->applet), new_panel);
- if (GTK_WIDGET_CAN_FOCUS (new_panel))
+ if (gtk_widget_get_can_focus (GTK_WIDGET (new_panel)))
GTK_WIDGET_UNSET_FLAGS (new_panel, GTK_CAN_FOCUS);
if (focus_widget) {
panel_widget_force_grab_focus (focus_widget);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
