[Xfce4-commits] [panel-plugins/xfce4-mount-plugin] 01/01: Added language sk Some pointer checks Nicer formatting of Makefile and configure

[noreply at xfce.org]

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

t   i   m   y   s   t   e   r   y       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-mount-plugin.

commit 8e1f37f3e99b8d3476e939ed78b9bfbf69c47de8
Author: Fabian <timystery at arcor.de>
Date:   Fri Jul 13 22:07:07 2018 +0200

    Added language sk
    Some pointer checks
    Nicer formatting of Makefile and configure
---
 Makefile.am                 | 29 +++++++++++++++--------------
 configure.ac.in             |  4 ++--
 panel-plugin/devices.c      |  2 +-
 panel-plugin/mount-plugin.c |  9 ++++++---
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ca82eac..7f262dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,40 +1,41 @@
 @SET_MAKE@
 
 SUBDIRS = panel-plugin \
-          po		\
-	  icons
+					po					 \
+					icons
 
 distclean-local:
 	rm -rf *.cache *~
 
 dist-bz2: dist
 	zcat $(PACKAGE)-$(VERSION).tar.gz | \
-	  bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+		bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
 
 distcheck-bz2: distcheck
 	zcat $(PACKAGE)-$(VERSION).tar.gz | \
-	  bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+		bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
 
 ChangeLog: Makefile
 	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \
-	&& mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \
-	|| (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
+		&& mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) \
+		|| (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
 
 dist-hook: ChangeLog
 
-EXTRA_DIST =                     			\
+EXTRA_DIST =							\
 	AUTHORS									\
 	COPYING									\
 	ChangeLog								\
 	INSTALL									\
-	NEWS									\
+	NEWS										\
 	README									\
-	TODO									\
-	intltool-extract.in						\
-	intltool-merge.in						\
+	TODO										\
+	intltool-extract.in			\
+	intltool-merge.in				\
 	intltool-update.in
 
-DISTCLEANFILES =							\
-	intltool-extract						\
-	intltool-merge							\
+DISTCLEANFILES =					\
+	intltool-extract				\
+	intltool-merge					\
 	intltool-update
+
diff --git a/configure.ac.in b/configure.ac.in
index 7fa6a8d..e3456ea 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -10,8 +10,8 @@ dnl for Xfce4-panel 4.12 and higher only!
 
 m4_define([mount_version_major], [1])
 m4_define([mount_version_minor], [1])
-m4_define([mount_version_micro], [2])
-m4_define([mount_version_tag], [git]) # Leave empty only for releases, but use 'git' in most cases
+m4_define([mount_version_micro], [3])
+m4_define([mount_version_tag], []) # Leave empty only for releases, but use 'git' in most cases
 m4_define([mount_version_build], [@REVISION@])
 m4_define([mount_version], [mount_version_major().mount_version_minor().mount_version_micro()ifelse(mount_version_tag(), [], [], [mount_version_tag()-mount_version_build()])])
 
diff --git a/panel-plugin/devices.c b/panel-plugin/devices.c
index 797b079..7313cfb 100644
--- a/panel-plugin/devices.c
+++ b/panel-plugin/devices.c
@@ -540,7 +540,7 @@ disks_free (GPtrArray ** pdisks)
     unsigned int i ;
     t_disk * pdisk ;
 
-    if (*pdisks != NULL)
+    if (pdisks != NULL && *pdisks != NULL)
     {
         for (i=0; i < (*pdisks)->len ; i++)
         {
diff --git a/panel-plugin/mount-plugin.c b/panel-plugin/mount-plugin.c
index a74c1cb..bbec7d5 100644
--- a/panel-plugin/mount-plugin.c
+++ b/panel-plugin/mount-plugin.c
@@ -260,9 +260,12 @@ mounter_data_free (t_mounter * mt)
 {
     TRACE ("enters mounter_data_free");
 
-    disks_free (&(mt->pdisks));
-    gtk_widget_destroy (GTK_WIDGET(mt->menu));
-    mt->menu = NULL;
+    if (mt != NULL)
+    {
+        disks_free (&(mt->pdisks));
+        gtk_widget_destroy (GTK_WIDGET(mt->menu));
+        mt->menu = NULL;
+    }
 
     TRACE ("leaves mounter_data_free");
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.