Hello community,
here is the log from the commit of package mate-indicator-applet for
openSUSE:Factory checked in at 2016-06-23 13:36:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-indicator-applet (Old)
and /work/SRC/openSUSE:Factory/.mate-indicator-applet.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-indicator-applet"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mate-indicator-applet/mate-indicator-applet.changes
2016-04-15 19:10:06.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mate-indicator-applet.new/mate-indicator-applet.changes
2016-06-23 13:36:21.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jun 20 15:30:32 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to version 1.14.1:
+ * GTK+3: Add support for new style indicators (that load from
+ directory /usr/share/unity/indicators/.
+ It requires libindicator >= 12.10 and libido >= 13.10. Support
+ for older versions of libindicator is left intact.
+ * GTK+3: Allow indicators to receive mouse scroll event.
+- Rename package to mate-applet-indicator.
+- Provide indicator-renderer-gtk2.
+
+-------------------------------------------------------------------
Old:
----
mate-indicator-applet-1.14.0.tar.xz
New:
----
mate-indicator-applet-1.14.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-indicator-applet.spec ++++++
--- /var/tmp/diff_new_pack.FC3afC/_old 2016-06-23 13:36:22.000000000 +0200
+++ /var/tmp/diff_new_pack.FC3afC/_new 2016-06-23 13:36:22.000000000 +0200
@@ -18,7 +18,7 @@
%define _version 1.14
Name: mate-indicator-applet
-Version: 1.14.0
+Version: 1.14.1
Release: 0
Summary: Information from applications consistently on the panel
License: GPL-3.0 and LGPL-3.0
@@ -27,14 +27,13 @@
Source0:
http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
BuildRequires: hicolor-icon-theme
BuildRequires: mate-common >= %{_version}
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(indicator-0.4)
BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= %{_version}
BuildRequires: pkgconfig(mate-settings-daemon) >= %{_version}
BuildRequires: pkgconfig(x11)
-Recommends: %{name}-lang
-%glib2_gsettings_schema_requires
%description
The indicator applet exposes Ayatana Indicators in the MATE Panel.
@@ -44,7 +43,26 @@
desktop panel. Existing indicators include the Message Menu,
Battery Menu and Sound menu.
-%lang_package
+%package -n mate-applet-indicator
+Summary: Information from applications consistently on the panel
+Group: System/GUI/Other
+Recommends: mate-applet-indicator-lang
+Provides: indicator-renderer-gtk2
+# mate-indicator-applet was last used in openSUSE Leap 42.1.
+Provides: %{name} = %{version}
+Obsoletes: %{name} < %{version}
+Obsoletes: %{name}-lang < %{version}
+%glib2_gsettings_schema_requires
+
+%description -n mate-applet-indicator
+The indicator applet exposes Ayatana Indicators in the MATE Panel.
+Ayatana Indicators are an initiative by Canonical to provide crisp
+and clean system and application status indication. They take the
+form of an icon and associated menu, displayed (usually) in the
+desktop panel. Existing indicators include the Message Menu,
+Battery Menu and Sound menu.
+
+%lang_package -n mate-applet-indicator
%prep
%setup -q
@@ -62,13 +80,13 @@
%make_install
%find_lang %{name}
-%post
+%post -n mate-applet-indicator
%glib2_gsettings_schema_post
-%postun
+%postun -n mate-applet-indicator
%glib2_gsettings_schema_postun
-%files
+%files -n mate-applet-indicator
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LGPL NEWS README
%{_libexecdir}/%{name}/
@@ -80,7 +98,7 @@
%{_datadir}/mate-panel/applets/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet
%{_datadir}/mate-panel/applets/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet
-%files lang -f %{name}.lang
+%files -n mate-applet-indicator-lang -f %{name}.lang
%defattr(-,root,root)
%changelog
++++++ mate-indicator-applet-1.14.0.tar.xz ->
mate-indicator-applet-1.14.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/ChangeLog
new/mate-indicator-applet-1.14.1/ChangeLog
--- old/mate-indicator-applet-1.14.0/ChangeLog 2016-04-08 13:39:33.000000000
+0200
+++ new/mate-indicator-applet-1.14.1/ChangeLog 2016-06-20 15:55:41.000000000
+0200
@@ -1,3 +1,79 @@
+commit fe1c2de727c4c680cc2547cee0c42f3b0e54d9b1
+Author: monsta <mon...@inbox.ru>
+Date: Mon Jun 20 16:54:24 2016 +0300
+
+ Release 1.14.1
+
+ NEWS | 8 ++++++++
+ configure.ac | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+commit 87a7e6290ac9dd5b5fac26d19a8ec8f559bcfc19
+Author: monsta <mon...@inbox.ru>
+Date: Mon Jun 20 15:11:23 2016 +0300
+
+ GTK+3: add support for new style indicators
+
+ they don't have .so files anymore, only the service binary,
+ and they're loaded from /usr/share/unity/indicators
+
+ they're supported only with libindicator3 >= 12.10
+
+ also this adds build-dep on libido (hmm, what Freud would say?)
+
+ configure.ac | 14 ++++++++-
+ src/applet-main.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
+ 2 files changed, 101 insertions(+), 4 deletions(-)
+
+commit b021717b78507b962efa20e3f278d6fb4257e276
+Author: monsta <mon...@inbox.ru>
+Date: Sun Jun 19 23:01:51 2016 +0300
+
+ build: make check for indicator lib a separate check
+
+ configure.ac | 6 +++++-
+ src/Makefile.am | 12 +++++++++---
+ 2 files changed, 14 insertions(+), 4 deletions(-)
+
+commit 59918b1a61c39b8d73a78bc7aac2d996383df1cb
+Author: monsta <mon...@inbox.ru>
+Date: Thu Jun 9 12:02:02 2016 +0300
+
+ GTK+3: allow indicators to receive mouse scroll event
+
+ will be handy for changing volume in indicator-sound with mouse scroll
+
+ src/applet-main.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+commit 1522904e12470f9e632c32c2b44555e41e11d15a
+Author: monsta <mon...@inbox.ru>
+Date: Wed Jun 8 14:17:45 2016 +0300
+
+ move indicator loading/setup code into separate function
+
+ src/applet-main.c | 39 ++++++++++++++++++++++-----------------
+ 1 file changed, 22 insertions(+), 17 deletions(-)
+
+commit 4385b4835dc16d392fe6ca8d84ab6aba4a725dfe
+Author: monsta <mon...@inbox.ru>
+Date: Wed Jun 8 12:20:26 2016 +0300
+
+ move module loading code into separate function
+
+ src/applet-main.c | 67 +++++++++++++++++++++++++++++++------------------------
+ 1 file changed, 38 insertions(+), 29 deletions(-)
+
+commit 814638d93298f71bad472658ac74a643d96e624d
+Author: monsta <mon...@inbox.ru>
+Date: Wed Jun 8 11:28:13 2016 +0300
+
+ eggaccelerators: remove unused function
+
+ src/eggaccelerators.c | 129 --------------------------------------------------
+ src/eggaccelerators.h | 3 --
+ 2 files changed, 132 deletions(-)
+
commit 94ec54914f5d722872d450bbbacc32c59582bc7b
Author: monsta <mon...@inbox.ru>
Date: Fri Apr 8 14:39:11 2016 +0300
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/Makefile.in
new/mate-indicator-applet-1.14.1/Makefile.in
--- old/mate-indicator-applet-1.14.0/Makefile.in 2016-04-08
13:39:23.000000000 +0200
+++ new/mate-indicator-applet-1.14.1/Makefile.in 2016-06-20
15:55:33.000000000 +0200
@@ -233,6 +233,8 @@
GREP = @GREP@
INDICATORDIR = @INDICATORDIR@
INDICATORICONSDIR = @INDICATORICONSDIR@
+INDICATOR_CFLAGS = @INDICATOR_CFLAGS@
+INDICATOR_LIBS = @INDICATOR_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/NEWS
new/mate-indicator-applet-1.14.1/NEWS
--- old/mate-indicator-applet-1.14.0/NEWS 2016-04-08 10:53:20.000000000
+0200
+++ new/mate-indicator-applet-1.14.1/NEWS 2016-06-20 15:52:38.000000000
+0200
@@ -1,3 +1,11 @@
+1.14.1
+
+ * GTK+3: add support for new style indicators (loaded
+ from /usr/share/unity/indicators dir). It requires
+ libindicator >= 12.10 and libido >= 13.10. Support
+ for older versions of libindicator is left intact.
+ * GTK+3: allow indicators to receive mouse scroll event
+
1.14.0
* GTK+3: fix a few deprecations
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/config.h.in
new/mate-indicator-applet-1.14.1/config.h.in
--- old/mate-indicator-applet-1.14.0/config.h.in 2016-04-08
13:39:22.000000000 +0200
+++ new/mate-indicator-applet-1.14.1/config.h.in 2016-06-20
15:55:32.000000000 +0200
@@ -18,6 +18,9 @@
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
+/* "New style indicators support" */
+#undef HAVE_INDICATOR_NG
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/configure
new/mate-indicator-applet-1.14.1/configure
--- old/mate-indicator-applet-1.14.0/configure 2016-04-08 13:39:22.000000000
+0200
+++ new/mate-indicator-applet-1.14.1/configure 2016-06-20 15:55:31.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mate-indicator-applet 1.14.0.
+# Generated by GNU Autoconf 2.69 for mate-indicator-applet 1.14.1.
#
# Report bugs to
<https://github.com/mate-desktop/mate-indicator-applet/issues>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='mate-indicator-applet'
PACKAGE_TARNAME='mate-indicator-applet'
-PACKAGE_VERSION='1.14.0'
-PACKAGE_STRING='mate-indicator-applet 1.14.0'
+PACKAGE_VERSION='1.14.1'
+PACKAGE_STRING='mate-indicator-applet 1.14.1'
PACKAGE_BUGREPORT='https://github.com/mate-desktop/mate-indicator-applet/issues'
PACKAGE_URL=''
@@ -656,6 +656,8 @@
GETTEXT_PACKAGE
INDICATORICONSDIR
INDICATORDIR
+INDICATOR_LIBS
+INDICATOR_CFLAGS
APPLET_LIBS
APPLET_CFLAGS
PKG_CONFIG_LIBDIR
@@ -842,7 +844,9 @@
PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
APPLET_CFLAGS
-APPLET_LIBS'
+APPLET_LIBS
+INDICATOR_CFLAGS
+INDICATOR_LIBS'
# Initialize some variables set by options.
@@ -1383,7 +1387,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mate-indicator-applet 1.14.0 to adapt to many kinds of
systems.
+\`configure' configures mate-indicator-applet 1.14.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1454,7 +1458,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-indicator-applet
1.14.0:";;
+ short | recursive ) echo "Configuration of mate-indicator-applet
1.14.1:";;
esac
cat <<\_ACEOF
@@ -1507,6 +1511,10 @@
APPLET_CFLAGS
C compiler flags for APPLET, overriding pkg-config
APPLET_LIBS linker flags for APPLET, overriding pkg-config
+ INDICATOR_CFLAGS
+ C compiler flags for INDICATOR, overriding pkg-config
+ INDICATOR_LIBS
+ linker flags for INDICATOR, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1574,7 +1582,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-indicator-applet configure 1.14.0
+mate-indicator-applet configure 1.14.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1943,7 +1951,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mate-indicator-applet $as_me 1.14.0, which was
+It was created by mate-indicator-applet $as_me 1.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2810,7 +2818,7 @@
# Define the identity of the package.
PACKAGE='mate-indicator-applet'
- VERSION='1.14.0'
+ VERSION='1.14.1'
cat >>confdefs.h <<_ACEOF
@@ -12985,6 +12993,7 @@
esac
INDICATOR_REQUIRED_VERSION=0.3.90
+INDICATOR_NG_VERSION=12.10
INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
@@ -13119,12 +13128,10 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- \$INDICATOR_PKG >= \$INDICATOR_REQUIRED_VERSION
\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >=
$GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -13132,7 +13139,6 @@
pkg_cv_APPLET_CFLAGS=`$PKG_CONFIG --cflags "gtk+-$GTK_API_VERSION >=
$GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
@@ -13148,12 +13154,10 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- \$INDICATOR_PKG >= \$INDICATOR_REQUIRED_VERSION
\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >=
$GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -13161,7 +13165,6 @@
pkg_cv_APPLET_LIBS=`$PKG_CONFIG --libs "gtk+-$GTK_API_VERSION >=
$GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
@@ -13186,13 +13189,11 @@
APPLET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
" 2>&1`
else
APPLET_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -13201,7 +13202,6 @@
as_fn_error $? "Package requirements (gtk+-$GTK_API_VERSION >=
$GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
) were not met:
$APPLET_PKG_ERRORS
@@ -13237,6 +13237,218 @@
+
+if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"\$INDICATOR_PKG >= \$INDICATOR_NG_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$INDICATOR_PKG >=
$INDICATOR_NG_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ have_indicator_ng="yes"
+else
+ have_indicator_ng="no"
+fi
+
+if test "x$with_gtk" = "x3.0" && test "x$have_indicator_ng" = "xyes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATOR" >&5
+$as_echo_n "checking for INDICATOR... " >&6; }
+
+if test -n "$INDICATOR_CFLAGS"; then
+ pkg_cv_INDICATOR_CFLAGS="$INDICATOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"\$INDICATOR_PKG >= \$INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$INDICATOR_PKG >= $INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "$INDICATOR_PKG >=
$INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$INDICATOR_LIBS"; then
+ pkg_cv_INDICATOR_LIBS="$INDICATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"\$INDICATOR_PKG >= \$INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$INDICATOR_PKG >= $INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "$INDICATOR_PKG >=
$INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$INDICATOR_PKG >= $INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10" 2>&1`
+ else
+ INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "$INDICATOR_PKG >= $INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$INDICATOR_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements ($INDICATOR_PKG >=
$INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10) were not met:
+
+$INDICATOR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables INDICATOR_CFLAGS
+and INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make
sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables INDICATOR_CFLAGS
+and INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ INDICATOR_CFLAGS=$pkg_cv_INDICATOR_CFLAGS
+ INDICATOR_LIBS=$pkg_cv_INDICATOR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_INDICATOR_NG 1" >>confdefs.h
+
+fi
+else
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INDICATOR" >&5
+$as_echo_n "checking for INDICATOR... " >&6; }
+
+if test -n "$INDICATOR_CFLAGS"; then
+ pkg_cv_INDICATOR_CFLAGS="$INDICATOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"\$INDICATOR_PKG >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$INDICATOR_PKG >=
$INDICATOR_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "$INDICATOR_PKG >=
$INDICATOR_REQUIRED_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$INDICATOR_LIBS"; then
+ pkg_cv_INDICATOR_LIBS="$INDICATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"\$INDICATOR_PKG >= \$INDICATOR_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$INDICATOR_PKG >=
$INDICATOR_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_INDICATOR_LIBS=`$PKG_CONFIG --libs "$INDICATOR_PKG >=
$INDICATOR_REQUIRED_VERSION" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "$INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION" 2>&1`
+ else
+ INDICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "$INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$INDICATOR_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements ($INDICATOR_PKG >=
$INDICATOR_REQUIRED_VERSION) were not met:
+
+$INDICATOR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables INDICATOR_CFLAGS
+and INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make
sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables INDICATOR_CFLAGS
+and INDICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ INDICATOR_CFLAGS=$pkg_cv_INDICATOR_CFLAGS
+ INDICATOR_LIBS=$pkg_cv_INDICATOR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+fi
+
+
+
+
###########################
# Check to see if we're local
###########################
@@ -14618,7 +14830,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mate-indicator-applet $as_me 1.14.0, which was
+This file was extended by mate-indicator-applet $as_me 1.14.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14684,7 +14896,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mate-indicator-applet config.status 1.14.0
+mate-indicator-applet config.status 1.14.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/configure.ac
new/mate-indicator-applet-1.14.1/configure.ac
--- old/mate-indicator-applet-1.14.0/configure.ac 2016-04-08
13:38:55.000000000 +0200
+++ new/mate-indicator-applet-1.14.1/configure.ac 2016-06-20
15:49:09.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.53)
-AC_INIT([mate-indicator-applet], [1.14.0],
[https://github.com/mate-desktop/mate-indicator-applet/issues])
+AC_INIT([mate-indicator-applet], [1.14.1],
[https://github.com/mate-desktop/mate-indicator-applet/issues])
AC_CONFIG_SRCDIR(src/applet-main.c)
AM_CONFIG_HEADER(config.h)
@@ -46,16 +46,32 @@
esac
INDICATOR_REQUIRED_VERSION=0.3.90
+INDICATOR_NG_VERSION=12.10
INDICATOR_PKG=indicator$INDICATOR_API_VERSION-0.4
PKG_CHECK_MODULES(APPLET, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION
x11
libmatepanelapplet-4.0
- $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION
)
+
AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)
+PKG_CHECK_EXISTS($INDICATOR_PKG >= $INDICATOR_NG_VERSION,
+ [have_indicator_ng="yes"],
+ [have_indicator_ng="no"])
+
+if test "x$with_gtk" = "x3.0" && test "x$have_indicator_ng" = "xyes"; then
+ PKG_CHECK_MODULES(INDICATOR, $INDICATOR_PKG >= $INDICATOR_NG_VERSION
+ libido3-0.1 >= 13.10,
+ [AC_DEFINE(HAVE_INDICATOR_NG, 1, "New style indicators
support")])
+else
+ PKG_CHECK_MODULES(INDICATOR, $INDICATOR_PKG >= $INDICATOR_REQUIRED_VERSION)
+fi
+
+AC_SUBST(INDICATOR_CFLAGS)
+AC_SUBST(INDICATOR_LIBS)
+
###########################
# Check to see if we're local
###########################
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/data/Makefile.in
new/mate-indicator-applet-1.14.1/data/Makefile.in
--- old/mate-indicator-applet-1.14.0/data/Makefile.in 2016-04-08
13:39:23.000000000 +0200
+++ new/mate-indicator-applet-1.14.1/data/Makefile.in 2016-06-20
15:55:33.000000000 +0200
@@ -186,6 +186,8 @@
GREP = @GREP@
INDICATORDIR = @INDICATORDIR@
INDICATORICONSDIR = @INDICATORICONSDIR@
+INDICATOR_CFLAGS = @INDICATOR_CFLAGS@
+INDICATOR_LIBS = @INDICATOR_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/src/Makefile.am
new/mate-indicator-applet-1.14.1/src/Makefile.am
--- old/mate-indicator-applet-1.14.0/src/Makefile.am 2015-08-31
14:12:55.000000000 +0200
+++ new/mate-indicator-applet-1.14.1/src/Makefile.am 2016-06-20
15:11:25.000000000 +0200
@@ -11,7 +11,8 @@
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS)
+ $(APPLET_CFLAGS) \
+ $(INDICATOR_CFLAGS)
mate_indicator_applet_SOURCES = \
applet-main.c \
@@ -22,6 +23,7 @@
mate_indicator_applet_LDADD = \
$(APPLET_LIBS) \
+ $(INDICATOR_LIBS) \
-lX11
mate_indicator_applet_appmenu_CFLAGS = \
@@ -31,7 +33,8 @@
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET_APPMENU \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS)
+ $(APPLET_CFLAGS) \
+ $(INDICATOR_CFLAGS)
mate_indicator_applet_appmenu_SOURCES = \
applet-main.c \
@@ -42,6 +45,7 @@
mate_indicator_applet_appmenu_LDADD = \
$(APPLET_LIBS) \
+ $(INDICATOR_LIBS) \
-lX11
mate_indicator_applet_complete_CFLAGS = \
@@ -51,7 +55,8 @@
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET_COMPLETE \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS)
+ $(APPLET_CFLAGS) \
+ $(INDICATOR_CFLAGS)
mate_indicator_applet_complete_SOURCES = \
applet-main.c \
@@ -62,4 +67,5 @@
mate_indicator_applet_complete_LDADD = \
$(APPLET_LIBS) \
+ $(INDICATOR_LIBS) \
-lX11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/src/Makefile.in
new/mate-indicator-applet-1.14.1/src/Makefile.in
--- old/mate-indicator-applet-1.14.0/src/Makefile.in 2016-04-08
13:39:23.000000000 +0200
+++ new/mate-indicator-applet-1.14.1/src/Makefile.in 2016-06-20
15:55:33.000000000 +0200
@@ -103,7 +103,8 @@
mate_indicator_applet-tomboykeybinder.$(OBJEXT)
mate_indicator_applet_OBJECTS = $(am_mate_indicator_applet_OBJECTS)
am__DEPENDENCIES_1 =
-mate_indicator_applet_DEPENDENCIES = $(am__DEPENDENCIES_1)
+mate_indicator_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -118,7 +119,8 @@
mate_indicator_applet_appmenu-tomboykeybinder.$(OBJEXT)
mate_indicator_applet_appmenu_OBJECTS = \
$(am_mate_indicator_applet_appmenu_OBJECTS)
-mate_indicator_applet_appmenu_DEPENDENCIES = $(am__DEPENDENCIES_1)
+mate_indicator_applet_appmenu_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
mate_indicator_applet_appmenu_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(mate_indicator_applet_appmenu_CFLAGS) $(CFLAGS) \
@@ -129,7 +131,8 @@
mate_indicator_applet_complete-tomboykeybinder.$(OBJEXT)
mate_indicator_applet_complete_OBJECTS = \
$(am_mate_indicator_applet_complete_OBJECTS)
-mate_indicator_applet_complete_DEPENDENCIES = $(am__DEPENDENCIES_1)
+mate_indicator_applet_complete_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
mate_indicator_applet_complete_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(mate_indicator_applet_complete_CFLAGS) $(CFLAGS) \
@@ -237,6 +240,8 @@
GREP = @GREP@
INDICATORDIR = @INDICATORDIR@
INDICATORICONSDIR = @INDICATORICONSDIR@
+INDICATOR_CFLAGS = @INDICATOR_CFLAGS@
+INDICATOR_LIBS = @INDICATOR_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -362,7 +367,8 @@
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS)
+ $(APPLET_CFLAGS) \
+ $(INDICATOR_CFLAGS)
mate_indicator_applet_SOURCES = \
applet-main.c \
@@ -373,6 +379,7 @@
mate_indicator_applet_LDADD = \
$(APPLET_LIBS) \
+ $(INDICATOR_LIBS) \
-lX11
mate_indicator_applet_appmenu_CFLAGS = \
@@ -382,7 +389,8 @@
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET_APPMENU \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS)
+ $(APPLET_CFLAGS) \
+ $(INDICATOR_CFLAGS)
mate_indicator_applet_appmenu_SOURCES = \
applet-main.c \
@@ -393,6 +401,7 @@
mate_indicator_applet_appmenu_LDADD = \
$(APPLET_LIBS) \
+ $(INDICATOR_LIBS) \
-lX11
mate_indicator_applet_complete_CFLAGS = \
@@ -402,7 +411,8 @@
-DINDICATOR_ICONS_DIR=\""$(INDICATORICONSDIR)"\" \
-DINDICATOR_APPLET_COMPLETE \
-I$(srcdir)/.. \
- $(APPLET_CFLAGS)
+ $(APPLET_CFLAGS) \
+ $(INDICATOR_CFLAGS)
mate_indicator_applet_complete_SOURCES = \
applet-main.c \
@@ -413,6 +423,7 @@
mate_indicator_applet_complete_LDADD = \
$(APPLET_LIBS) \
+ $(INDICATOR_LIBS) \
-lX11
all: all-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/src/applet-main.c
new/mate-indicator-applet-1.14.1/src/applet-main.c
--- old/mate-indicator-applet-1.14.0/src/applet-main.c 2016-01-21
09:34:32.000000000 +0100
+++ new/mate-indicator-applet-1.14.1/src/applet-main.c 2016-06-20
15:11:25.000000000 +0200
@@ -28,7 +28,14 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "libindicator/indicator-object.h"
+#include <libindicator/indicator-object.h>
+
+/* For new style indicators */
+#if HAVE_INDICATOR_NG
+#include <libido/libido.h>
+#include <libindicator/indicator-ng.h>
+#endif
+
#include "tomboykeybinder.h"
static gchar * indicator_order[] = {
@@ -291,6 +298,11 @@
gtk_hbox_new(FALSE, 3) : gtk_vbox_new(FALSE, 3);
#endif
+#if GTK_CHECK_VERSION (3, 0, 0)
+ /* Allows indicators to receive mouse scroll event in GTK+3 */
+ gtk_widget_add_events(GTK_WIDGET(menuitem), GDK_SCROLL_MASK);
+#endif
+
g_object_set_data (G_OBJECT (menuitem), "indicator", io);
g_object_set_data (G_OBJECT (menuitem), "box", box);
@@ -505,29 +517,23 @@
return;
}
-
-static gboolean
-load_module (const gchar * name, GtkWidget * menubar)
+static void
+load_indicator (GtkWidget * menubar, IndicatorObject *io, const gchar *name)
{
- g_debug("Looking at Module: %s", name);
- g_return_val_if_fail(name != NULL, FALSE);
-
- if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) {
- return FALSE;
- }
-
- g_debug("Loading Module: %s", name);
-
- /* Build the object for the module */
- gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
- IndicatorObject * io = indicator_object_new_from_file(fullpath);
- g_free(fullpath);
-
/* Set the environment it's in */
indicator_object_set_environment(io, (const GStrv)indicator_env);
/* Attach the 'name' to the object */
- g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER,
GINT_TO_POINTER(name2order(name)));
+#if HAVE_INDICATOR_NG
+ int pos = 5000 - indicator_object_get_position(io);
+ if (pos > 5000) {
+ pos = name2order(name);
+ }
+#else
+ int pos = name2order(name);
+#endif
+
+ g_object_set_data(G_OBJECT(io), IO_DATA_ORDER_NUMBER,
GINT_TO_POINTER(pos));
/* Connect to its signals */
g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ENTRY_ADDED,
G_CALLBACK(entry_added), menubar);
@@ -546,11 +552,130 @@
}
g_list_free(entries);
+}
+
+static gboolean
+load_module (const gchar * name, GtkWidget * menubar)
+{
+ g_debug("Looking at Module: %s", name);
+ g_return_val_if_fail(name != NULL, FALSE);
+
+ if (!g_str_has_suffix(name, G_MODULE_SUFFIX)) {
+ return FALSE;
+ }
+
+ g_debug("Loading Module: %s", name);
+
+ /* Build the object for the module */
+ gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
+ IndicatorObject * io = indicator_object_new_from_file(fullpath);
+ g_free(fullpath);
+
+ load_indicator(menubar, io, name);
return TRUE;
}
static void
+load_modules (GtkWidget *menubar, gint *indicators_loaded)
+{
+ if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS |
G_FILE_TEST_IS_DIR))) {
+ GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
+
+ const gchar * name;
+ gint count = 0;
+ while ((name = g_dir_read_name(dir)) != NULL) {
+#ifdef INDICATOR_APPLET_APPMENU
+ if (g_strcmp0(name, "libappmenu.so")) {
+ continue;
+ }
+#else
+ if (!g_strcmp0(name, "libappmenu.so")) {
+ continue;
+ }
+#endif
+#ifdef INDICATOR_APPLET
+ if (!g_strcmp0(name, "libme.so")) {
+ continue;
+ }
+ if (!g_strcmp0(name, "libdatetime.so")) {
+ continue;
+ }
+#endif
+ if (load_module(name, menubar)) {
+ count++;
+ }
+ }
+
+ *indicators_loaded += count;
+
+ g_dir_close (dir);
+ }
+}
+
+#if HAVE_INDICATOR_NG
+
+#define INDICATOR_SERVICE_DIR "/usr/share/unity/indicators"
+
+static void
+load_indicators_from_indicator_files (GtkWidget *menubar, gint
*indicators_loaded)
+{
+ GDir *dir;
+ const gchar *name;
+ GError *error = NULL;
+
+ dir = g_dir_open (INDICATOR_SERVICE_DIR, 0, &error);
+
+ if (!dir) {
+ g_warning ("unable to open indicator service file directory:
%s", error->message);
+ g_error_free (error);
+
+ return;
+ }
+
+ gint count = 0;
+ while ((name = g_dir_read_name (dir))) {
+ gchar *filename;
+ IndicatorNg *indicator;
+
+ filename = g_build_filename (INDICATOR_SERVICE_DIR, name, NULL);
+ indicator = indicator_ng_new_for_profile (filename, "desktop",
&error);
+ g_free (filename);
+
+#ifdef INDICATOR_APPLET_APPMENU
+ if (g_strcmp0(name, "com.canonical.indicator.appmenu")) {
+ continue;
+ }
+#else
+ if (!g_strcmp0(name, "com.canonical.indicator.appmenu")) {
+ continue;
+ }
+#endif
+#ifdef INDICATOR_APPLET
+ if (!g_strcmp0(name, "com.canonical.indicator.me")) {
+ continue;
+ }
+ if (!g_strcmp0(name, "com.canonical.indicator.datetime")) {
+ continue;
+ }
+#endif
+
+ if (indicator) {
+ load_indicator(menubar, INDICATOR_OBJECT (indicator),
name);
+ count++;
+ }else{
+ g_warning ("unable to load '%s': %s", name,
error->message);
+ g_clear_error (&error);
+ }
+ }
+
+ *indicators_loaded += count;
+
+ g_dir_close (dir);
+}
+#endif /* HAVE_INDICATOR_NG */
+
+static void
hotkey_filter (char * keystring G_GNUC_UNUSED, gpointer data)
{
g_return_if_fail(GTK_IS_MENU_SHELL(data));
@@ -797,6 +922,10 @@
applet_fill_cb (MatePanelApplet * applet, const gchar * iid G_GNUC_UNUSED,
gpointer data G_GNUC_UNUSED)
{
+#if HAVE_INDICATOR_NG
+ ido_init();
+#endif
+
static const GtkActionEntry menu_actions[] = {
{"About", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL,
G_CALLBACK(about_cb)}
};
@@ -903,35 +1032,10 @@
/* Add in filter func */
tomboy_keybinder_bind(hotkey_keycode, hotkey_filter, menubar);
- /* load 'em */
- if (g_file_test(INDICATOR_DIR, (G_FILE_TEST_EXISTS |
G_FILE_TEST_IS_DIR))) {
- GDir * dir = g_dir_open(INDICATOR_DIR, 0, NULL);
-
- const gchar * name;
- while ((name = g_dir_read_name(dir)) != NULL) {
-#ifdef INDICATOR_APPLET_APPMENU
- if (g_strcmp0(name, "libappmenu.so")) {
- continue;
- }
-#else
- if (!g_strcmp0(name, "libappmenu.so")) {
- continue;
- }
+ load_modules(menubar, &indicators_loaded);
+#if HAVE_INDICATOR_NG
+ load_indicators_from_indicator_files(menubar, &indicators_loaded);
#endif
-#ifdef INDICATOR_APPLET
- if (!g_strcmp0(name, "libme.so")) {
- continue;
- }
- if (!g_strcmp0(name, "libdatetime.so")) {
- continue;
- }
-#endif
- if (load_module(name, menubar)) {
- indicators_loaded++;
- }
- }
- g_dir_close (dir);
- }
if (indicators_loaded == 0) {
/* A label to allow for click through */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/src/eggaccelerators.c
new/mate-indicator-applet-1.14.1/src/eggaccelerators.c
--- old/mate-indicator-applet-1.14.0/src/eggaccelerators.c 2015-10-20
10:54:50.000000000 +0200
+++ new/mate-indicator-applet-1.14.1/src/eggaccelerators.c 2016-06-20
15:05:48.000000000 +0200
@@ -330,135 +330,6 @@
return !bad_keyval;
}
-
-/**
- * egg_virtual_accelerator_name:
- * @accelerator_key: accelerator keyval
- * @accelerator_mods: accelerator modifier mask
- * @returns: a newly-allocated accelerator name
- *
- * Converts an accelerator keyval and modifier mask
- * into a string parseable by egg_accelerator_parse_virtual().
- * For example, if you pass in #GDK_q and #EGG_VIRTUAL_CONTROL_MASK,
- * this function returns "<Control>q".
- *
- * The caller of this function must free the returned string.
- */
-gchar*
-egg_virtual_accelerator_name (guint accelerator_key,
- EggVirtualModifierType accelerator_mods)
-{
- static const gchar text_release[] = "<Release>";
- static const gchar text_shift[] = "<Shift>";
- static const gchar text_control[] = "<Control>";
- static const gchar text_mod1[] = "<Alt>";
- static const gchar text_mod2[] = "<Mod2>";
- static const gchar text_mod3[] = "<Mod3>";
- static const gchar text_mod4[] = "<Mod4>";
- static const gchar text_mod5[] = "<Mod5>";
- static const gchar text_meta[] = "<Meta>";
- static const gchar text_super[] = "<Super>";
- static const gchar text_hyper[] = "<Hyper>";
- guint l;
- gchar *keyval_name;
- gchar *accelerator;
-
- accelerator_mods &= EGG_VIRTUAL_MODIFIER_MASK;
-
- keyval_name = gdk_keyval_name (gdk_keyval_to_lower (accelerator_key));
- if (!keyval_name)
- keyval_name = "";
-
- l = 0;
- if (accelerator_mods & EGG_VIRTUAL_RELEASE_MASK)
- l += sizeof (text_release) - 1;
- if (accelerator_mods & EGG_VIRTUAL_SHIFT_MASK)
- l += sizeof (text_shift) - 1;
- if (accelerator_mods & EGG_VIRTUAL_CONTROL_MASK)
- l += sizeof (text_control) - 1;
- if (accelerator_mods & EGG_VIRTUAL_ALT_MASK)
- l += sizeof (text_mod1) - 1;
- if (accelerator_mods & EGG_VIRTUAL_MOD2_MASK)
- l += sizeof (text_mod2) - 1;
- if (accelerator_mods & EGG_VIRTUAL_MOD3_MASK)
- l += sizeof (text_mod3) - 1;
- if (accelerator_mods & EGG_VIRTUAL_MOD4_MASK)
- l += sizeof (text_mod4) - 1;
- if (accelerator_mods & EGG_VIRTUAL_MOD5_MASK)
- l += sizeof (text_mod5) - 1;
- if (accelerator_mods & EGG_VIRTUAL_META_MASK)
- l += sizeof (text_meta) - 1;
- if (accelerator_mods & EGG_VIRTUAL_HYPER_MASK)
- l += sizeof (text_hyper) - 1;
- if (accelerator_mods & EGG_VIRTUAL_SUPER_MASK)
- l += sizeof (text_super) - 1;
- l += strlen (keyval_name);
-
- accelerator = g_new (gchar, l + 1);
-
- l = 0;
- accelerator[l] = 0;
- if (accelerator_mods & EGG_VIRTUAL_RELEASE_MASK)
- {
- strcpy (accelerator + l, text_release);
- l += sizeof (text_release) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_SHIFT_MASK)
- {
- strcpy (accelerator + l, text_shift);
- l += sizeof (text_shift) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_CONTROL_MASK)
- {
- strcpy (accelerator + l, text_control);
- l += sizeof (text_control) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_ALT_MASK)
- {
- strcpy (accelerator + l, text_mod1);
- l += sizeof (text_mod1) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_MOD2_MASK)
- {
- strcpy (accelerator + l, text_mod2);
- l += sizeof (text_mod2) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_MOD3_MASK)
- {
- strcpy (accelerator + l, text_mod3);
- l += sizeof (text_mod3) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_MOD4_MASK)
- {
- strcpy (accelerator + l, text_mod4);
- l += sizeof (text_mod4) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_MOD5_MASK)
- {
- strcpy (accelerator + l, text_mod5);
- l += sizeof (text_mod5) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_META_MASK)
- {
- strcpy (accelerator + l, text_meta);
- l += sizeof (text_meta) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_HYPER_MASK)
- {
- strcpy (accelerator + l, text_hyper);
- l += sizeof (text_hyper) - 1;
- }
- if (accelerator_mods & EGG_VIRTUAL_SUPER_MASK)
- {
- strcpy (accelerator + l, text_super);
- l += sizeof (text_super) - 1;
- }
-
- strcpy (accelerator + l, keyval_name);
-
- return accelerator;
-}
-
void
egg_keymap_resolve_virtual_modifiers (GdkKeymap *keymap,
EggVirtualModifierType virtual_mods,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-indicator-applet-1.14.0/src/eggaccelerators.h
new/mate-indicator-applet-1.14.1/src/eggaccelerators.h
--- old/mate-indicator-applet-1.14.0/src/eggaccelerators.h 2015-08-31
14:12:55.000000000 +0200
+++ new/mate-indicator-applet-1.14.1/src/eggaccelerators.h 2016-06-20
15:05:48.000000000 +0200
@@ -76,9 +76,6 @@
GdkModifierType
concrete_mods,
EggVirtualModifierType
*virtual_mods);
-gchar* egg_virtual_accelerator_name (guint accelerator_key,
- EggVirtualModifierType accelerator_mods);
-
G_END_DECLS
