Hello community,
here is the log from the commit of package mate-indicator-applet for
openSUSE:Factory checked in at 2015-11-11 10:30:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-07-03 00:09:51.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.mate-indicator-applet.new/mate-indicator-applet.changes
2015-11-11 10:30:38.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Nov 5 20:43:01 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.12.0.
+
+-------------------------------------------------------------------
+Thu Oct 15 18:45:24 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 1.11.0:
+ * Bug fixes.
+
+-------------------------------------------------------------------
Old:
----
mate-indicator-applet-1.10.0.tar.xz
New:
----
mate-indicator-applet-1.12.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-indicator-applet.spec ++++++
--- /var/tmp/diff_new_pack.gIr8uv/_old 2015-11-11 10:30:39.000000000 +0100
+++ /var/tmp/diff_new_pack.gIr8uv/_new 2015-11-11 10:30:39.000000000 +0100
@@ -16,24 +16,24 @@
#
-%define _version 1.10
+%define _version 1.12
Name: mate-indicator-applet
-Version: 1.10.0
+Version: 1.12.0
Release: 0
Summary: Information from applications consistently on the panel
License: GPL-3.0 and LGPL-3.0
Group: System/GUI/Other
-Url: http://mate-desktop.org
+Url: http://mate-desktop.org/
Source0:
http://pub.mate-desktop.org/releases/%{_version}/%{name}-%{version}.tar.xz
BuildRequires: hicolor-icon-theme
-# Do not own /usr/share/mate-panel/applets/
-BuildRequires: mate-applets
-BuildRequires: mate-common >= 1.9.0
+BuildRequires: mate-common >= %{_version}
BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(indicator-0.4)
-BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= 1.9.0
-BuildRequires: pkgconfig(mate-settings-daemon) >= 1.9.0
-Recommends: %{name}-lang = %{version}
+BuildRequires: pkgconfig(libmatepanelapplet-4.0) >= %{_version}
+BuildRequires: pkgconfig(mate-settings-daemon) >= %{_version}
+BuildRequires: pkgconfig(x11)
+Recommends: %{name}-lang
%glib2_gsettings_schema_requires
%description
@@ -60,7 +60,7 @@
%make_install
%find_lang %{name}
if [ -d %{buildroot}%{_datadir}/MateConf/ ]; then
- rm -r %{buildroot}%{_datadir}/MateConf/
+ rm -rf %{buildroot}%{_datadir}/MateConf/
fi
%post
@@ -72,9 +72,11 @@
%files
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LGPL NEWS README
-%{_libexecdir}/mate-indicator-applet/
+%{_libexecdir}/%{name}/
%{_datadir}/dbus-1/services/org.mate.panel.applet.IndicatorApplet*.service
-%{_datadir}/icons/hicolor/scalable/apps/mate-indicator-applet.svg
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%dir %{_datadir}/mate-panel/
+%dir %{_datadir}/mate-panel/applets/
%{_datadir}/mate-panel/applets/org.ayatana.panel.IndicatorApplet.mate-panel-applet
%{_datadir}/mate-panel/applets/org.ayatana.panel.IndicatorAppletAppmenu.mate-panel-applet
%{_datadir}/mate-panel/applets/org.ayatana.panel.IndicatorAppletComplete.mate-panel-applet
++++++ mate-indicator-applet-1.10.0.tar.xz ->
mate-indicator-applet-1.12.0.tar.xz ++++++
++++ 2312 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-indicator-applet-1.10.0/ChangeLog
new/mate-indicator-applet-1.12.0/ChangeLog
--- old/mate-indicator-applet-1.10.0/ChangeLog 2015-05-06 08:54:37.000000000
+0200
+++ new/mate-indicator-applet-1.12.0/ChangeLog 2015-11-04 18:05:44.000000000
+0100
@@ -1,5 +1,83 @@
# Generated by Makefile. Do not edit.
+commit c6e5ccfd138e38117ac69b833629e107f957fa74
+Author: Clement Lefebvre <clement.lefeb...@linuxmint.com>
+Date: Tue Nov 3 14:59:46 2015 +0000
+
+ 1.12.0
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit a96836d59925819898e6e4bb904277942e90a4b8
+Author: Clement Lefebvre <clement.lefeb...@linuxmint.com>
+Date: Tue Nov 3 14:59:33 2015 +0000
+
+ Sync translations with transifex
+
+ po/jv.po | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 94 insertions(+)
+
+commit ea2602e3edf65c27f821469a1d2f8d89ecb133bc
+Author: monsta <mon...@inbox.ru>
+Date: Fri Oct 30 15:35:22 2015 +0300
+
+ update NEWS for 1.12
+
+ NEWS | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 2b58046ae99939949d5eb0c74267d9b1fd498fb7
+Author: Martin Wimpress <c...@flexion.org>
+Date: Thu Oct 15 15:45:48 2015 +0100
+
+ Bump version to 1.11.0
+
+ NEWS | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit ecd31dd63eed1cf8b0e74ed79dcaa78fc02f1f40
+Author: raveit65 <chat-to...@raveit.de>
+Date: Tue Oct 6 18:20:01 2015 +0200
+
+ pre-bump version to 1.11.0
+
+ NEWS | 2 ++
+ configure.ac | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+commit 1158ea5facb894076cb5d8558bfa582c06d1ede8
+Author: monsta <mon...@inbox.ru>
+Date: Mon Aug 31 15:13:52 2015 +0300
+
+ removed trailing spaces
+
+ src/applet-main.c | 28 +++++++++----------
+ src/eggaccelerators.c | 70 +++++++++++++++++++++++------------------------
+ src/tomboykeybinder.c | 76 +++++++++++++++++++++++++--------------------------
+ 3 files changed, 87 insertions(+), 87 deletions(-)
+
+commit 12950bcb78d0c5cbfc055c362ff526336c9fc774
+Author: monsta <mon...@inbox.ru>
+Date: Wed Aug 19 10:55:41 2015 +0300
+
+ configure.ac: drop obsolete macro
+
+ It's been a no-op for a long time.
+ See
https://mail.gnome.org/archives/commits-list/2011-December/msg00681.html for
example.
+
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+commit 5f8beda3a0b423deeb1e4a64f4d3c5fbad8005b2
+Author: Monsta <mon...@inbox.ru>
+Date: Mon Aug 3 16:21:33 2015 +0300
+
+ drop gdkkeysyms-compat usage, use modern key names
+
+ src/eggaccelerators.c | 22 +++++++++-------------
+ 1 file changed, 9 insertions(+), 13 deletions(-)
+
commit 884fbf235d34f2f89fb690a6a8c6644ff6ef3723
Author: Stefano Karapetsas <stef...@karapetsas.com>
Date: Wed May 6 08:54:07 2015 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-indicator-applet-1.10.0/NEWS new/mate-indicator-applet-1.12.0/NEWS
--- old/mate-indicator-applet-1.10.0/NEWS 2015-05-06 08:54:04.000000000
+0200
+++ new/mate-indicator-applet-1.12.0/NEWS 2015-11-04 18:04:28.000000000
+0100
@@ -1,3 +1,7 @@
+1.12.0
+
+ * Bug fixes and cleanups
+
1.10.0
* Add GTK3 support
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-indicator-applet-1.10.0/compile
new/mate-indicator-applet-1.12.0/compile
--- old/mate-indicator-applet-1.10.0/compile 2015-05-06 08:54:23.000000000
+0200
+++ new/mate-indicator-applet-1.12.0/compile 2015-11-04 18:05:10.000000000
+0100
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tro...@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-indicator-applet-1.10.0/configure.ac
new/mate-indicator-applet-1.12.0/configure.ac
--- old/mate-indicator-applet-1.10.0/configure.ac 2015-05-06
08:53:59.000000000 +0200
+++ new/mate-indicator-applet-1.12.0/configure.ac 2015-11-04
18:04:28.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ(2.53)
-AC_INIT([mate-indicator-applet], [1.10.0],
[https://github.com/mate-desktop/mate-indicator-applet/issues])
+AC_INIT([mate-indicator-applet], [1.12.0],
[https://github.com/mate-desktop/mate-indicator-applet/issues])
AC_CONFIG_SRCDIR(src/applet-main.c)
AM_CONFIG_HEADER(config.h)
@@ -10,7 +10,6 @@
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
IT_PROG_INTLTOOL([0.35.0])
-AC_ISC_POSIX
AC_PROG_CC
AM_PROG_CC_C_O
AC_STDC_HEADERS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-indicator-applet-1.10.0/missing
new/mate-indicator-applet-1.12.0/missing
--- old/mate-indicator-applet-1.10.0/missing 2015-05-06 08:54:23.000000000
+0200
+++ new/mate-indicator-applet-1.12.0/missing 2015-11-04 18:05:10.000000000
+0100
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-indicator-applet-1.10.0/src/applet-main.c
new/mate-indicator-applet-1.12.0/src/applet-main.c
--- old/mate-indicator-applet-1.10.0/src/applet-main.c 2014-07-04
14:42:31.000000000 +0200
+++ new/mate-indicator-applet-1.12.0/src/applet-main.c 2015-08-31
15:17:24.000000000 +0200
@@ -97,7 +97,7 @@
GOutputStream * log_file = NULL;
/*****************
- * Hotkey support
+ * Hotkey support
* **************/
#ifdef INDICATOR_APPLET
gchar * hotkey_keycode = "<Super>M";
@@ -314,12 +314,12 @@
break;
case GTK_PACK_DIRECTION_TTB:
gtk_label_set_angle(GTK_LABEL(entry->label),
- (orient ==
MATE_PANEL_APPLET_ORIENT_LEFT) ?
+ (orient ==
MATE_PANEL_APPLET_ORIENT_LEFT) ?
270.0 : 90.0);
break;
default:
break;
- }
+ }
gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->label),
FALSE, FALSE, 1);
if (gtk_widget_get_visible(GTK_WIDGET(entry->label))) {
@@ -671,12 +671,12 @@
break;
case GTK_PACK_DIRECTION_TTB:
gtk_label_set_angle(GTK_LABEL(item),
- (orient ==
MATE_PANEL_APPLET_ORIENT_LEFT) ?
+ (orient ==
MATE_PANEL_APPLET_ORIENT_LEFT) ?
270.0 : 90.0);
break;
default:
break;
- }
+ }
}
gtk_box_pack_start(GTK_BOX(to), item, FALSE, FALSE, 0);
return TRUE;
@@ -703,12 +703,12 @@
gpointer data)
{
GtkWidget *menubar = (GtkWidget *)data;
- if ((((neworient == MATE_PANEL_APPLET_ORIENT_UP) ||
- (neworient == MATE_PANEL_APPLET_ORIENT_DOWN)) &&
- ((orient == MATE_PANEL_APPLET_ORIENT_LEFT) ||
- (orient == MATE_PANEL_APPLET_ORIENT_RIGHT))) ||
- (((neworient == MATE_PANEL_APPLET_ORIENT_LEFT) ||
- (neworient == MATE_PANEL_APPLET_ORIENT_RIGHT)) &&
+ if ((((neworient == MATE_PANEL_APPLET_ORIENT_UP) ||
+ (neworient == MATE_PANEL_APPLET_ORIENT_DOWN)) &&
+ ((orient == MATE_PANEL_APPLET_ORIENT_LEFT) ||
+ (orient == MATE_PANEL_APPLET_ORIENT_RIGHT))) ||
+ (((neworient == MATE_PANEL_APPLET_ORIENT_LEFT) ||
+ (neworient == MATE_PANEL_APPLET_ORIENT_RIGHT)) &&
((orient == MATE_PANEL_APPLET_ORIENT_UP) ||
(orient == MATE_PANEL_APPLET_ORIENT_DOWN)))) {
packdirection = (packdirection == GTK_PACK_DIRECTION_LTR) ?
@@ -810,7 +810,7 @@
#ifdef INDICATOR_APPLET_APPMENU
g_set_application_name(_("Indicator Applet Application Menu"));
#endif
-
+
g_log_set_default_handler(log_to_file, NULL);
tomboy_keybinder_init();
@@ -875,7 +875,7 @@
/* Build menubar */
orient = (mate_panel_applet_get_orient(applet));
packdirection = ((orient == MATE_PANEL_APPLET_ORIENT_UP) ||
- (orient == MATE_PANEL_APPLET_ORIENT_DOWN)) ?
+ (orient == MATE_PANEL_APPLET_ORIENT_DOWN)) ?
GTK_PACK_DIRECTION_LTR : GTK_PACK_DIRECTION_TTB;
gtk_menu_bar_set_pack_direction(GTK_MENU_BAR(menubar),
packdirection);
@@ -887,7 +887,7 @@
#else
g_signal_connect_after(menubar, "expose-event",
G_CALLBACK(menubar_on_expose), menubar);
#endif
- g_signal_connect(applet, "change-orient",
+ g_signal_connect(applet, "change-orient",
G_CALLBACK(matepanelapplet_reorient_cb), menubar);
gtk_container_set_border_width(GTK_CONTAINER(menubar), 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-indicator-applet-1.10.0/src/eggaccelerators.c
new/mate-indicator-applet-1.12.0/src/eggaccelerators.c
--- old/mate-indicator-applet-1.10.0/src/eggaccelerators.c 2014-07-04
14:42:31.000000000 +0200
+++ new/mate-indicator-applet-1.12.0/src/eggaccelerators.c 2015-08-31
15:17:24.000000000 +0200
@@ -14,18 +14,14 @@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110, USA
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110, USA
*/
#include "eggaccelerators.h"
#include <string.h>
#include <gdk/gdkx.h>
-#if GTK_CHECK_VERSION(3,0,0)
-#include <gdk/gdkkeysyms-compat.h>
-#else
#include <gdk/gdkkeysyms.h>
-#endif
enum
{
@@ -200,7 +196,7 @@
* can represent various keyboard keys (numlock, meta, hyper, etc.),
* the virtual modifier represents the keyboard key, the concrete
* modifier the actual Mod2-Mod5 bits in the key press event.
- *
+ *
* Returns: %TRUE on success.
*/
gboolean
@@ -212,7 +208,7 @@
GdkModifierType mods;
gint len;
gboolean bad_keyval;
-
+
if (accelerator_key)
*accelerator_key = 0;
if (accelerator_mods)
@@ -221,7 +217,7 @@
g_return_val_if_fail (accelerator != NULL, FALSE);
bad_keyval = FALSE;
-
+
keyval = 0;
mods = 0;
len = strlen (accelerator);
@@ -304,7 +300,7 @@
else
{
gchar last_ch;
-
+
last_ch = *accelerator;
while (last_ch && last_ch != '>')
{
@@ -317,15 +313,15 @@
else
{
keyval = gdk_keyval_from_name (accelerator);
-
+
if (keyval == 0)
bad_keyval = TRUE;
-
+
accelerator += len;
- len -= len;
+ len -= len;
}
}
-
+
if (accelerator_key)
*accelerator_key = gdk_keyval_to_lower (keyval);
if (accelerator_mods)
@@ -340,7 +336,7 @@
* @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,
@@ -457,7 +453,7 @@
strcpy (accelerator + l, text_super);
l += sizeof (text_super) - 1;
}
-
+
strcpy (accelerator + l, keyval_name);
return accelerator;
@@ -474,11 +470,11 @@
g_return_if_fail (GDK_IS_KEYMAP (keymap));
g_return_if_fail (concrete_mods != NULL);
-
+
modmap = egg_keymap_get_modmap (keymap);
-
+
/* Not so sure about this algorithm. */
-
+
concrete = 0;
i = 0;
while (i < EGG_MODMAP_ENTRY_LAST)
@@ -500,14 +496,14 @@
GdkModifierType virtual;
int i;
const EggModmap *modmap;
-
+
g_return_if_fail (GDK_IS_KEYMAP (keymap));
g_return_if_fail (virtual_mods != NULL);
modmap = egg_keymap_get_modmap (keymap);
-
+
/* Not so sure about this algorithm. */
-
+
virtual = 0;
i = 0;
while (i < EGG_MODMAP_ENTRY_LAST)
@@ -515,12 +511,12 @@
if ((1 << i) & concrete_mods)
{
EggVirtualModifierType cleaned;
-
+
cleaned = modmap->mapping[i] & ~(EGG_VIRTUAL_MOD2_MASK |
EGG_VIRTUAL_MOD3_MASK |
EGG_VIRTUAL_MOD4_MASK |
EGG_VIRTUAL_MOD5_MASK);
-
+
if (cleaned != 0)
{
virtual |= cleaned;
@@ -533,10 +529,10 @@
virtual |= modmap->mapping[i];
}
}
-
+
++i;
}
-
+
*virtual_mods = virtual;
}
@@ -552,7 +548,7 @@
xmodmap = XGetModifierMapping (gdk_x11_get_default_xdisplay ());
memset (modmap->mapping, 0, sizeof (modmap->mapping));
-
+
/* there are 8 modifiers, and the first 3 are shift, shift lock,
* and control
*/
@@ -569,7 +565,7 @@
int n_entries;
int j;
EggVirtualModifierType mask;
-
+
keys = NULL;
keyvals = NULL;
n_entries = 0;
@@ -577,39 +573,39 @@
gdk_keymap_get_entries_for_keycode (keymap,
keycode,
&keys, &keyvals, &n_entries);
-
+
mask = 0;
j = 0;
while (j < n_entries)
- {
- if (keyvals[j] == GDK_Num_Lock)
+ {
+ if (keyvals[j] == GDK_KEY_Num_Lock)
mask |= EGG_VIRTUAL_NUM_LOCK_MASK;
- else if (keyvals[j] == GDK_Scroll_Lock)
+ else if (keyvals[j] == GDK_KEY_Scroll_Lock)
mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK;
- else if (keyvals[j] == GDK_Meta_L ||
- keyvals[j] == GDK_Meta_R)
+ else if (keyvals[j] == GDK_KEY_Meta_L ||
+ keyvals[j] == GDK_KEY_Meta_R)
mask |= EGG_VIRTUAL_META_MASK;
- else if (keyvals[j] == GDK_Hyper_L ||
- keyvals[j] == GDK_Hyper_R)
+ else if (keyvals[j] == GDK_KEY_Hyper_L ||
+ keyvals[j] == GDK_KEY_Hyper_R)
mask |= EGG_VIRTUAL_HYPER_MASK;
- else if (keyvals[j] == GDK_Super_L ||
- keyvals[j] == GDK_Super_R)
+ else if (keyvals[j] == GDK_KEY_Super_L ||
+ keyvals[j] == GDK_KEY_Super_R)
mask |= EGG_VIRTUAL_SUPER_MASK;
- else if (keyvals[j] == GDK_Mode_switch)
+ else if (keyvals[j] == GDK_KEY_Mode_switch)
mask |= EGG_VIRTUAL_MODE_SWITCH_MASK;
-
+
++j;
}
/* Mod1Mask is 1 << 3 for example, i.e. the
* fourth modifier, i / keyspermod is the modifier
* index
- */
+ */
modmap->mapping[i/xmodmap->max_keypermod] |= mask;
-
+
g_free (keyvals);
- g_free (keys);
-
+ g_free (keys);
+
++i;
}
@@ -622,7 +618,7 @@
modmap->mapping[EGG_MODMAP_ENTRY_MOD3] |= EGG_VIRTUAL_MOD3_MASK;
modmap->mapping[EGG_MODMAP_ENTRY_MOD4] |= EGG_VIRTUAL_MOD4_MASK;
modmap->mapping[EGG_MODMAP_ENTRY_MOD5] |= EGG_VIRTUAL_MOD5_MASK;
-
+
XFreeModifiermap (xmodmap);
}
@@ -634,7 +630,7 @@
/* This is all a hack, much simpler when we can just
* modify GDK directly.
*/
-
+
modmap = g_object_get_data (G_OBJECT (keymap),
"egg-modmap");
@@ -645,9 +641,9 @@
/* FIXME modify keymap change events with an event filter
* and force a reload if we get one
*/
-
+
reload_modmap (keymap, modmap);
-
+
g_object_set_data_full (G_OBJECT (keymap),
"egg-modmap",
modmap,
@@ -655,6 +651,6 @@
}
g_assert (modmap != NULL);
-
+
return modmap;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/mate-indicator-applet-1.10.0/src/tomboykeybinder.c
new/mate-indicator-applet-1.12.0/src/tomboykeybinder.c
--- old/mate-indicator-applet-1.10.0/src/tomboykeybinder.c 2014-07-04
14:42:31.000000000 +0200
+++ new/mate-indicator-applet-1.12.0/src/tomboykeybinder.c 2015-08-31
15:17:24.000000000 +0200
@@ -13,7 +13,7 @@
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110, USA
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110, USA
*/
#include <string.h>
@@ -51,21 +51,21 @@
static void
lookup_ignorable_modifiers (GdkKeymap *keymap)
{
- egg_keymap_resolve_virtual_modifiers (keymap,
+ egg_keymap_resolve_virtual_modifiers (keymap,
EGG_VIRTUAL_LOCK_MASK,
&caps_lock_mask);
- egg_keymap_resolve_virtual_modifiers (keymap,
+ egg_keymap_resolve_virtual_modifiers (keymap,
EGG_VIRTUAL_NUM_LOCK_MASK,
&num_lock_mask);
- egg_keymap_resolve_virtual_modifiers (keymap,
+ egg_keymap_resolve_virtual_modifiers (keymap,
EGG_VIRTUAL_SCROLL_LOCK_MASK,
&scroll_lock_mask);
}
static void
-grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
+grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
Binding *binding,
gboolean grab)
{
@@ -83,23 +83,23 @@
for (i = 0; i < G_N_ELEMENTS (mod_masks); i++) {
if (grab) {
- XGrabKey (GDK_WINDOW_XDISPLAY (rootwin),
- binding->keycode,
- binding->modifiers | mod_masks [i],
- GDK_WINDOW_XID (rootwin),
- False,
+ XGrabKey (GDK_WINDOW_XDISPLAY (rootwin),
+ binding->keycode,
+ binding->modifiers | mod_masks [i],
+ GDK_WINDOW_XID (rootwin),
+ False,
GrabModeAsync,
GrabModeAsync);
} else {
XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin),
binding->keycode,
- binding->modifiers | mod_masks [i],
+ binding->modifiers | mod_masks [i],
GDK_WINDOW_XID (rootwin));
}
}
}
-static gboolean
+static gboolean
do_grab_key (Binding *binding)
{
GdkKeymap *keymap = gdk_keymap_get_default ();
@@ -111,14 +111,14 @@
if (keymap == NULL || rootwin == NULL)
return FALSE;
- if (!egg_accelerator_parse_virtual (binding->keystring,
- &keysym,
+ if (!egg_accelerator_parse_virtual (binding->keystring,
+ &keysym,
&virtual_mods))
return FALSE;
TRACE (g_print ("Got accel %d, %d\n", keysym, virtual_mods));
- binding->keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (rootwin),
+ binding->keycode = XKeysymToKeycode (GDK_WINDOW_XDISPLAY (rootwin),
keysym);
if (binding->keycode == 0)
return FALSE;
@@ -135,8 +135,8 @@
gdk_error_trap_push ();
- grab_ungrab_with_ignorable_modifiers (rootwin,
- binding,
+ grab_ungrab_with_ignorable_modifiers (rootwin,
+ binding,
TRUE /* grab */);
gdk_flush ();
@@ -149,15 +149,15 @@
return TRUE;
}
-static gboolean
+static gboolean
do_ungrab_key (Binding *binding)
{
GdkWindow *rootwin = gdk_get_default_root_window ();
TRACE (g_print ("Removing grab for '%s'\n", binding->keystring));
- grab_ungrab_with_ignorable_modifiers (rootwin,
- binding,
+ grab_ungrab_with_ignorable_modifiers (rootwin,
+ binding,
FALSE /* ungrab */);
return TRUE;
@@ -176,31 +176,31 @@
switch (xevent->type) {
case KeyPress:
- TRACE (g_print ("Got KeyPress! keycode: %d, modifiers: %d\n",
- xevent->xkey.keycode,
+ TRACE (g_print ("Got KeyPress! keycode: %d, modifiers: %d\n",
+ xevent->xkey.keycode,
xevent->xkey.state));
- /*
+ /*
* Set the last event time for use when showing
* windows to avoid anti-focus-stealing code.
*/
processing_event = TRUE;
last_event_time = xevent->xkey.time;
- event_mods = xevent->xkey.state & ~(num_lock_mask |
- caps_lock_mask |
+ event_mods = xevent->xkey.state & ~(num_lock_mask |
+ caps_lock_mask |
scroll_lock_mask);
for (iter = bindings; iter != NULL; iter = iter->next) {
Binding *binding = (Binding *) iter->data;
-
+
if (binding->keycode == xevent->xkey.keycode &&
binding->modifiers == event_mods) {
- TRACE (g_print ("Calling handler for
'%s'...\n",
+ TRACE (g_print ("Calling handler for '%s'...\n",
binding->keystring));
- (binding->handler) (binding->keystring,
+ (binding->handler) (binding->keystring,
binding->user_data);
}
}
@@ -215,7 +215,7 @@
return return_val;
}
-static void
+static void
keymap_changed (GdkKeymap *map G_GNUC_UNUSED)
{
GdkKeymap *keymap = gdk_keymap_get_default ();
@@ -236,7 +236,7 @@
}
}
-void
+void
tomboy_keybinder_init (void)
{
GdkKeymap *keymap = gdk_keymap_get_default ();
@@ -244,17 +244,17 @@
lookup_ignorable_modifiers (keymap);
- gdk_window_add_filter (rootwin,
- filter_func,
+ gdk_window_add_filter (rootwin,
+ filter_func,
NULL);
- g_signal_connect (keymap,
+ g_signal_connect (keymap,
"keys_changed",
G_CALLBACK (keymap_changed),
NULL);
}
-void
+void
tomboy_keybinder_bind (const char *keystring,
TomboyBindkeyHandler handler,
gpointer user_data)
@@ -279,7 +279,7 @@
}
void
-tomboy_keybinder_unbind (const char *keystring,
+tomboy_keybinder_unbind (const char *keystring,
TomboyBindkeyHandler handler)
{
GSList *iter;
@@ -288,7 +288,7 @@
Binding *binding = (Binding *) iter->data;
if (strcmp (keystring, binding->keystring) != 0 ||
- handler != binding->handler)
+ handler != binding->handler)
continue;
do_ungrab_key (binding);
@@ -301,7 +301,7 @@
}
}
-/*
+/*
* From eggcellrenderkeys.c.
*/
gboolean
@@ -333,7 +333,7 @@
guint32
tomboy_keybinder_get_current_event_time (void)
{
- if (processing_event)
+ if (processing_event)
return last_event_time;
else
return GDK_CURRENT_TIME;
