[Pkg-privacy-commits] [seahorse-nautilus] 17/26: Fix warnings we can fix and silence ones we can't.

[Carlos Maddela]

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

maddela-guest pushed a commit to branch master
in repository seahorse-nautilus.

commit 4d5530fa86a94867f75dc018f96a6de3110df11a
Author: Carlos Maddela <e7appew at gmail.com>
Date:   Sun Jan 8 20:56:22 2017 +1100

    Fix warnings we can fix and silence ones we can't.
    
    Not fixing ISO C pedantic or deprecated API warnings.
---
 debian/patches/fix-warnings.patch | 105 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |   1 +
 debian/rules                      |   1 +
 3 files changed, 107 insertions(+)

diff --git a/debian/patches/fix-warnings.patch b/debian/patches/fix-warnings.patch
new file mode 100644
index 0000000..de04f34
--- /dev/null
+++ b/debian/patches/fix-warnings.patch
@@ -0,0 +1,105 @@
+From: Carlos Maddela <e7appew at gmail.com>
+Date: Sun, 8 Jan 2017 18:26:44 +1100
+Subject: Fix non-ISO-C and non-deprecated-API warnings.
+
+Description: Fix non-ISO-C and non-deprecated-API warnings.
+Author: Carlos Maddela <e7appew at gmail.com>
+Origin: vendor
+Forwarded: no
+Last-Update: 2017-01-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+ tool/seahorse-notification.c |  2 +-
+ tool/seahorse-operation.c    |  2 +-
+ tool/seahorse-operation.h    |  2 +-
+ tool/seahorse-util.c         |  6 +++---
+ tool/seahorse-widget.c       | 18 +++++++++---------
+ 5 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/tool/seahorse-notification.c b/tool/seahorse-notification.c
+index 52f46d5..f84c7b4 100644
+--- a/tool/seahorse-notification.c
++++ b/tool/seahorse-notification.c
+@@ -66,7 +66,7 @@ typedef struct _SeahorseNotificationClass {
+ 
+ GType seahorse_notification_get_type (void) G_GNUC_CONST;
+ 
+-G_DEFINE_TYPE (SeahorseNotification, seahorse_notification, G_TYPE_OBJECT);
++G_DEFINE_TYPE (SeahorseNotification, seahorse_notification, G_TYPE_OBJECT)
+ 
+ static CryptUIKeyset *keyset = NULL;
+ 
+diff --git a/tool/seahorse-operation.c b/tool/seahorse-operation.c
+index c2bb2cc..bc10658 100644
+--- a/tool/seahorse-operation.c
++++ b/tool/seahorse-operation.c
+@@ -60,7 +60,7 @@ enum {
+ 
+ static guint signals[LAST_SIGNAL] = { 0 };
+ 
+-G_DEFINE_TYPE (SeahorseOperation, seahorse_operation, G_TYPE_OBJECT);
++G_DEFINE_TYPE (SeahorseOperation, seahorse_operation, G_TYPE_OBJECT)
+ 
+ /* OBJECT ------------------------------------------------------------------- */
+ 
+diff --git a/tool/seahorse-operation.h b/tool/seahorse-operation.h
+index ca70b8f..c8b9840 100644
+--- a/tool/seahorse-operation.h
++++ b/tool/seahorse-operation.h
+@@ -64,7 +64,7 @@ typedef struct _SeahorseOperation {
+ 
+     guint is_running : 1;          /* If the operation is running or not */
+     guint is_done : 1;             /* Operation is done or not */
+-    guint is_cancelled : 1;        /* Operation is cancelled or not */;
++    guint is_cancelled : 1;        /* Operation is cancelled or not */
+ 
+     GError *error;
+ 
+diff --git a/tool/seahorse-util.c b/tool/seahorse-util.c
+index eee092c..789b7d5 100644
+--- a/tool/seahorse-util.c
++++ b/tool/seahorse-util.c
+@@ -56,9 +56,9 @@ seahorse_util_show_error (GtkWindow *parent, const gchar *heading, const gchar *
+ 		GTK_BUTTONS_CLOSE, NULL);
+ 
+ 	if (heading)
+-        g_object_set (G_OBJECT (error), "text", heading, "secondary-text", message, NULL);
+-    else
+-        g_object_set (G_OBJECT (error), "text", message, NULL);
++		g_object_set (G_OBJECT (error), "text", heading, "secondary-text", message, NULL);
++	else
++		g_object_set (G_OBJECT (error), "text", message, NULL);
+ 
+ 	gtk_dialog_run (GTK_DIALOG (error));
+ 	gtk_widget_destroy (error);
+diff --git a/tool/seahorse-widget.c b/tool/seahorse-widget.c
+index bb75c0e..df487ac 100644
+--- a/tool/seahorse-widget.c
++++ b/tool/seahorse-widget.c
+@@ -168,16 +168,16 @@ object_finalize (GObject *gobject)
+ 	swidget = SEAHORSE_WIDGET (gobject);
+ 
+ 	/* Remove widget from hash and destroy hash if empty */
+-    if (widgets) {
+-    	g_hash_table_remove (widgets, swidget->name);
+-    	if (g_hash_table_size (widgets) == 0) {
+-    		g_hash_table_destroy (widgets);
+-    		widgets = NULL;
+-    	}
+-    }
++	if (widgets) {
++		g_hash_table_remove (widgets, swidget->name);
++		if (g_hash_table_size (widgets) == 0) {
++			g_hash_table_destroy (widgets);
++			widgets = NULL;
++		}
++	}
+ 
+-    if (seahorse_widget_get_widget (swidget, swidget->name))
+-        gtk_widget_destroy (GTK_WIDGET (seahorse_widget_get_widget (swidget, swidget->name)));
++	if (seahorse_widget_get_widget (swidget, swidget->name))
++		gtk_widget_destroy (GTK_WIDGET (seahorse_widget_get_widget (swidget, swidget->name)));
+ 
+ 	g_object_unref (swidget->gtkbuilder);
+ 	swidget->gtkbuilder = NULL;
diff --git a/debian/patches/series b/debian/patches/series
index fb724e1..55ccaa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 gpg21.patch
 update-Makefile-am.patch
+fix-warnings.patch
diff --git a/debian/rules b/debian/rules
index 8e51394..6f6998d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+export DEB_CFLAGS_MAINT_APPEND = -Wall -Wno-deprecated-declarations
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 MUTABLE_FILES := \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/seahorse-nautilus.git