[libmatekbd] 01/01: Revert "Added glib >= 2.43.1 compatibility patch."

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository libmatekbd.

commit 4724f6328056a28efc0a5f20964348bc940d8efb
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Mar 9 11:38:44 2015 +0100

    Revert "Added glib >= 2.43.1 compatibility patch."
    
    This reverts commit 20de2a4e94c21520d3f9e79e52c68b14fd2ceaac.
---
 debian/patches/0001_glib_connect_first.patch | 80 ----------------------------
 debian/patches/series                        |  1 -
 2 files changed, 81 deletions(-)

diff --git a/debian/patches/0001_glib_connect_first.patch b/debian/patches/0001_glib_connect_first.patch
deleted file mode 100644
index 82a042f..0000000
--- a/debian/patches/0001_glib_connect_first.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From ff8ef09c586c6a12964492801530a70a70c5b446 Mon Sep 17 00:00:00 2001
-From: Monsta <monsta at inbox.ru>
-Date: Tue, 24 Feb 2015 16:34:34 +0300
-Subject: [PATCH] first connect to settings, then read them.
-
-fixes the issue with GLib >= 2.43,
-https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861b3619
----
- libmatekbd/matekbd-indicator.c | 17 +++++++++--------
- libmatekbd/matekbd-status.c    | 15 ++++++++-------
- 2 files changed, 17 insertions(+), 15 deletions(-)
-
-diff --git a/libmatekbd/matekbd-indicator.c b/libmatekbd/matekbd-indicator.c
-index 74cb919..aef88d2 100644
---- a/libmatekbd/matekbd-indicator.c
-+++ b/libmatekbd/matekbd-indicator.c
-@@ -807,6 +807,15 @@ matekbd_indicator_global_init (void)
- 	matekbd_keyboard_config_init (&globals.kbd_cfg, globals.engine);
- 	matekbd_indicator_config_init (&globals.ind_cfg, globals.engine);
- 
-+	matekbd_desktop_config_start_listen (&globals.cfg,
-+					  (GCallback)
-+					  matekbd_indicator_cfg_changed,
-+					  NULL);
-+	matekbd_indicator_config_start_listen (&globals.ind_cfg,
-+					    (GCallback)
-+					    matekbd_indicator_ind_cfg_changed,
-+					    NULL);
-+
- 	matekbd_desktop_config_load_from_gsettings (&globals.cfg);
- 	matekbd_desktop_config_activate (&globals.cfg);
- 
-@@ -827,14 +836,6 @@ matekbd_indicator_global_init (void)
- 					 xklrec->variants);
- 	g_object_unref (G_OBJECT (xklrec));
- 
--	matekbd_desktop_config_start_listen (&globals.cfg,
--					  (GCallback)
--					  matekbd_indicator_cfg_changed,
--					  NULL);
--	matekbd_indicator_config_start_listen (&globals.ind_cfg,
--					    (GCallback)
--					    matekbd_indicator_ind_cfg_changed,
--					    NULL);
- 	matekbd_indicator_start_listen ();
- 
- 	xkl_debug (100, "*** Inited globals *** \n");
-diff --git a/libmatekbd/matekbd-status.c b/libmatekbd/matekbd-status.c
-index b0c19be..3f6c613 100644
---- a/libmatekbd/matekbd-status.c
-+++ b/libmatekbd/matekbd-status.c
-@@ -778,6 +778,14 @@ matekbd_status_global_init (void)
- 	matekbd_keyboard_config_init (&globals.kbd_cfg, globals.engine);
- 	matekbd_indicator_config_init (&globals.ind_cfg, globals.engine);
- 
-+	matekbd_desktop_config_start_listen (&globals.cfg,
-+					  (GCallback)
-+					  matekbd_status_cfg_changed, NULL);
-+	matekbd_indicator_config_start_listen (&globals.ind_cfg,
-+					    (GCallback)
-+					    matekbd_status_ind_cfg_changed,
-+					    NULL);
-+
- 	matekbd_desktop_config_load_from_gsettings (&globals.cfg);
- 	matekbd_desktop_config_activate (&globals.cfg);
- 
-@@ -800,13 +808,6 @@ matekbd_status_global_init (void)
- 				      (const gchar **) xklrec->variants);
- 	g_object_unref (G_OBJECT (xklrec));
- 
--	matekbd_desktop_config_start_listen (&globals.cfg,
--					  (GCallback)
--					  matekbd_status_cfg_changed, NULL);
--	matekbd_indicator_config_start_listen (&globals.ind_cfg,
--					    (GCallback)
--					    matekbd_status_ind_cfg_changed,
--					    NULL);
- 	matekbd_status_start_listen ();
- 
- 	xkl_debug (100, "*** Inited globals *** \n");
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2c829f4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001_glib_connect_first.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/libmatekbd.git