[pluma] 02/04: rebase

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository pluma.

commit 3e74b64b0429c0feb5133f8b554a3fa848808f04
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 11 13:00:59 2015 +0200

    rebase
---
 debian/patches/0003_glib243-compat.patch | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/debian/patches/0003_glib243-compat.patch b/debian/patches/0003_glib243-compat.patch
index 1e778ac..390caa6 100644
--- a/debian/patches/0003_glib243-compat.patch
+++ b/debian/patches/0003_glib243-compat.patch
@@ -10,12 +10,10 @@ https://git.gnome.org/browse/glib/commit/?id=8ff5668a458344da22d30491e3ce726d861
  plugins/filebrowser/pluma-file-browser-plugin.c | 54 ++++++++++++++-----------
  1 file changed, 30 insertions(+), 24 deletions(-)
 
-diff --git a/plugins/filebrowser/pluma-file-browser-plugin.c b/plugins/filebrowser/pluma-file-browser-plugin.c
-index 030ab78..6198ea0 100644
 --- a/plugins/filebrowser/pluma-file-browser-plugin.c
 +++ b/plugins/filebrowser/pluma-file-browser-plugin.c
-@@ -312,6 +312,18 @@ on_confirm_trash_changed (GSettings *settings,
-    data->confirm_trash = enable;
+@@ -312,6 +312,18 @@
+ 	data->confirm_trash = enable;
  }
  
 +static gboolean
@@ -33,9 +31,9 @@ index 030ab78..6198ea0 100644
  static void
  install_caja_prefs (PlumaFileBrowserPluginData *data)
  {
-@@ -320,41 +332,35 @@ install_caja_prefs (PlumaFileBrowserPluginData *data)
-    PlumaFileBrowserViewClickPolicy policy;
-    PlumaFileBrowserView *view;
+@@ -320,41 +332,35 @@
+ 	PlumaFileBrowserViewClickPolicy policy;
+ 	PlumaFileBrowserView *view;
  
 -	/* Get click_policy */
 -	pref = g_settings_get_string (data->caja_settings, CAJA_CLICK_POLICY_KEY);
@@ -50,18 +48,18 @@ index 030ab78..6198ea0 100644
 +	                  "changed::" CAJA_ENABLE_DELETE_KEY,
 +	                  G_CALLBACK (on_enable_delete_changed),
 +	                  data);
- 
++
 +	g_signal_connect (data->caja_settings,
 +	                  "changed::" CAJA_CONFIRM_TRASH_KEY,
 +	                  G_CALLBACK (on_confirm_trash_changed),
 +	                  data);
-+
+ 
 +	pref = g_settings_get_string (data->caja_settings, CAJA_CLICK_POLICY_KEY);
-    policy = click_policy_from_string (pref);
+ 	policy = click_policy_from_string (pref);
 +	g_free (pref);
  
-    view = pluma_file_browser_widget_get_browser_view (data->tree_widget);
-    pluma_file_browser_view_set_click_policy (view, policy);
+ 	view = pluma_file_browser_widget_get_browser_view (data->tree_widget);
+ 	pluma_file_browser_view_set_click_policy (view, policy);
  
 -	if (pref) {
 -		g_signal_connect (data->caja_settings,
@@ -72,9 +70,9 @@ index 030ab78..6198ea0 100644
 -	}
 -
 -	/* Get enable_delete */
-    prefb = g_settings_get_boolean (data->caja_settings, CAJA_ENABLE_DELETE_KEY);
+ 	prefb = g_settings_get_boolean (data->caja_settings, CAJA_ENABLE_DELETE_KEY);
 -
-    g_object_set (G_OBJECT (data->tree_widget), "enable-delete", prefb, NULL);
+ 	g_object_set (G_OBJECT (data->tree_widget), "enable-delete", prefb, NULL);
  
 -	g_signal_connect (data->caja_settings,
 -					  "changed::" CAJA_ENABLE_DELETE_KEY,
@@ -82,9 +80,9 @@ index 030ab78..6198ea0 100644
 -					  data);
 -
 -	/* Get confirm_trash */
-    prefb = g_settings_get_boolean (data->caja_settings, CAJA_CONFIRM_TRASH_KEY);
+ 	prefb = g_settings_get_boolean (data->caja_settings, CAJA_CONFIRM_TRASH_KEY);
 -
-    data->confirm_trash = prefb;
+ 	data->confirm_trash = prefb;
 -
 -	g_signal_connect (data->caja_settings,
 -					  "changed::" CAJA_CONFIRM_TRASH_KEY,

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