user 605305 + patch thanks attached for upstream released 0.1.6 -- Mahyuddin Susanto GPG: A0C3 AA91 1E0D B7CB F899 F67B 96FD 0511 8E7A 9CB0
diff -Nru gadmin-rsync-0.1.5/aclocal.m4 gadmin-rsync-0.1.6/aclocal.m4
--- gadmin-rsync-0.1.5/aclocal.m4 2009-07-13 03:07:03.000000000 +0700
+++ gadmin-rsync-0.1.6/aclocal.m4 2010-10-22 03:22:35.000000000 +0700
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -623,7 +623,7 @@
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -639,7 +639,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -Nru gadmin-rsync-0.1.5/ChangeLog gadmin-rsync-0.1.6/ChangeLog
--- gadmin-rsync-0.1.5/ChangeLog 2009-11-20 17:54:54.000000000 +0700
+++ gadmin-rsync-0.1.6/ChangeLog 2010-10-22 03:21:29.000000000 +0700
@@ -1,3 +1,7 @@
+0.1.6
+-----------------------------
+Allow channels to read binary data.
+
0.1.5
-----------------------------
diff -Nru gadmin-rsync-0.1.5/configure gadmin-rsync-0.1.6/configure
--- gadmin-rsync-0.1.5/configure 2009-10-27 07:15:28.000000000 +0700
+++ gadmin-rsync-0.1.6/configure 2010-10-22 06:02:09.000000000 +0700
@@ -2338,7 +2338,7 @@
# Define the identity of the package.
PACKAGE=gadmin-rsync
- VERSION=0.1.5
+ VERSION=0.1.6
cat >>confdefs.h <<_ACEOF
diff -Nru gadmin-rsync-0.1.5/configure.in gadmin-rsync-0.1.6/configure.in
--- gadmin-rsync-0.1.5/configure.in 2009-10-27 07:15:16.000000000 +0700
+++ gadmin-rsync-0.1.6/configure.in 2010-10-22 03:22:12.000000000 +0700
@@ -2,7 +2,7 @@
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gadmin-rsync, 0.1.5)
+AM_INIT_AUTOMAKE(gadmin-rsync, 0.1.6)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -Nru gadmin-rsync-0.1.5/debian/changelog
gadmin-rsync-0.1.6/debian/changelog
--- gadmin-rsync-0.1.5/debian/changelog 2010-11-29 02:36:27.000000000 +0700
+++ gadmin-rsync-0.1.6/debian/changelog 2010-12-29 00:55:03.000000000 +0700
@@ -1,3 +1,11 @@
+gadmin-rsync (0.1.6) unstable; urgency=low
+
+ * NMU upload (Closes: #605305)
+ * New upstream release
+ * Add myself to Maintainer
+
+ -- Mahyuddin Susanto <[email protected]> Wed, 29 Dec 2010 00:54:29 +0700
+
gadmin-rsync (0.1.5-3) unstable; urgency=low
* Removing vcs fields.
diff -Nru gadmin-rsync-0.1.5/debian/compat gadmin-rsync-0.1.6/debian/compat
--- gadmin-rsync-0.1.5/debian/compat 2010-11-29 02:36:09.000000000 +0700
+++ gadmin-rsync-0.1.6/debian/compat 2010-12-29 01:26:45.000000000 +0700
@@ -1 +1 @@
-8
+7
diff -Nru gadmin-rsync-0.1.5/debian/control gadmin-rsync-0.1.6/debian/control
--- gadmin-rsync-0.1.5/debian/control 2010-11-29 02:36:02.000000000 +0700
+++ gadmin-rsync-0.1.6/debian/control 2010-12-29 01:28:15.000000000 +0700
@@ -1,8 +1,9 @@
Source: gadmin-rsync
Section: admin
Priority: optional
-Maintainer: Debian QA Group <[email protected]>
-Build-Depends: debhelper (>= 8), autotools-dev, libgtk2.0-dev
+Maintainer: Mahyuddin Susanto <[email protected]>
+DM-Upload-Allowed: yes
+Build-Depends: debhelper (>= 7), autotools-dev, libgtk2.0-dev
Standards-Version: 3.9.1
Homepage: http://www.gadmintools.org/
diff -Nru gadmin-rsync-0.1.5/debian/rules gadmin-rsync-0.1.6/debian/rules
--- gadmin-rsync-0.1.5/debian/rules 2010-11-29 02:36:01.000000000 +0700
+++ gadmin-rsync-0.1.6/debian/rules 2010-12-29 01:26:25.000000000 +0700
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $...@} --with autotools_dev
+ dh $...@}
override_dh_auto_clean:
dh_auto_clean
diff -Nru gadmin-rsync-0.1.5/gadmin-rsync.spec
gadmin-rsync-0.1.6/gadmin-rsync.spec
--- gadmin-rsync-0.1.5/gadmin-rsync.spec 2009-11-20 17:31:30.000000000
+0700
+++ gadmin-rsync-0.1.6/gadmin-rsync.spec 2010-10-25 21:11:48.000000000
+0700
@@ -1,9 +1,9 @@
%define desktop_vendor newrpms
-%{!?_dist: %{expand: %%define dist rhfc11}}
+%{!?_dist: %{expand: %%define dist rhfc12}}
Summary: GAdmin-Rsync - An easy to use GTK+ frontend for the rsync
backup client and server.
Name: gadmin-rsync
-Version: 0.1.5
+Version: 0.1.6
Release: 0.1.%{dist}.nr
License: GPL
Group: Applications/System
@@ -67,6 +67,8 @@
%{_datadir}/pixmaps/%{name}/*.png
%changelog
+* Mon Oct 25 2010 Magnus Loef <[email protected]>
+- Allow channels to read binary data.
* Fri Oct 24 2009 Magnus Loef <[email protected]>
- The program can now restore a backup or parts of it.
- Switches to the progress tab when a backup or
diff -Nru gadmin-rsync-0.1.5/Makefile.in gadmin-rsync-0.1.6/Makefile.in
--- gadmin-rsync-0.1.5/Makefile.in 2009-10-27 07:15:30.000000000 +0700
+++ gadmin-rsync-0.1.6/Makefile.in 2010-10-22 06:02:11.000000000 +0700
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -285,7 +285,7 @@
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -310,7 +310,7 @@
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -477,7 +477,8 @@
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ || find "$(distdir)" -type d ! -perm -755 \
+ -exec chmod u+rwx,go+rx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -521,17 +522,17 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff -Nru gadmin-rsync-0.1.5/MAKE_RPM gadmin-rsync-0.1.6/MAKE_RPM
--- gadmin-rsync-0.1.5/MAKE_RPM 2009-10-24 01:58:26.000000000 +0700
+++ gadmin-rsync-0.1.6/MAKE_RPM 2010-10-22 06:00:11.000000000 +0700
@@ -1,10 +1,9 @@
#!/bin/sh
# Make a Redhat RPM.
-version='0.1.5'
+version='0.1.6'
cd ..
-# Works for Fedora up to FC9: tar -zhcvf
/usr/src/redhat/SOURCES/gadmin-rsync-$version.tar.gz gadmin-rsync-$version
tar -zhcvf /root/rpmbuild/SOURCES/gadmin-rsync-$version.tar.gz
gadmin-rsync-$version
cd gadmin-rsync-$version
rpmbuild -ba gadmin-rsync.spec
diff -Nru gadmin-rsync-0.1.5/MAKE_TGZ gadmin-rsync-0.1.6/MAKE_TGZ
--- gadmin-rsync-0.1.5/MAKE_TGZ 2009-11-20 17:31:50.000000000 +0700
+++ gadmin-rsync-0.1.6/MAKE_TGZ 2010-10-22 06:00:16.000000000 +0700
@@ -1,6 +1,6 @@
#!/bin/sh
-version='0.1.5'
+version='0.1.6'
beta=''
make clean
diff -Nru gadmin-rsync-0.1.5/po/Makefile gadmin-rsync-0.1.6/po/Makefile
--- gadmin-rsync-0.1.5/po/Makefile 2009-11-20 18:22:15.000000000 +0700
+++ gadmin-rsync-0.1.6/po/Makefile 2010-10-25 21:12:12.000000000 +0700
@@ -14,7 +14,7 @@
GETTEXT_PACKAGE = gadmin-rsync
PACKAGE = gadmin-rsync
-VERSION = 0.1.5
+VERSION = 0.1.6
SHELL = /bin/sh
@@ -32,7 +32,7 @@
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
-INSTALL = /bin/install -c
+INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs
diff -Nru gadmin-rsync-0.1.5/po/Makefile.in gadmin-rsync-0.1.6/po/Makefile.in
--- gadmin-rsync-0.1.5/po/Makefile.in 2009-11-20 18:22:15.000000000 +0700
+++ gadmin-rsync-0.1.6/po/Makefile.in 2010-10-25 21:12:11.000000000 +0700
@@ -14,7 +14,7 @@
GETTEXT_PACKAGE = gadmin-rsync
PACKAGE = gadmin-rsync
-VERSION = 0.1.5
+VERSION = 0.1.6
SHELL = /bin/sh
@@ -32,7 +32,7 @@
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
-INSTALL = /bin/install -c
+INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
MKINSTALLDIRS = $(top_srcdir)/./mkinstalldirs
diff -Nru gadmin-rsync-0.1.5/src/backup_and_restore.c
gadmin-rsync-0.1.6/src/backup_and_restore.c
--- gadmin-rsync-0.1.5/src/backup_and_restore.c 2009-10-24 00:35:47.000000000
+0700
+++ gadmin-rsync-0.1.6/src/backup_and_restore.c 2010-10-22 04:24:17.000000000
+0700
@@ -45,10 +45,7 @@
if( ! client_active )
return;
- /* This isnt very good. howto signal the parents childs children ?
- (parent->child->script child->children) */
-
- /* Kill all rsync processes (This is not good) */
+ /* Kill all rsync processes (This is not optimal) */
cmd = g_strdup_printf("killall -9 rsync");
if( ! run_command(cmd) )
{
@@ -141,16 +138,21 @@
/* Read standard output and insert in progress textview */
GIOChannel *output_channel = g_io_channel_unix_new(standard_output);
+ /* Accept binary, allow no buffering */
+ g_io_channel_set_encoding(output_channel, NULL, NULL);
+
ret = g_io_add_watch(output_channel, G_IO_IN | G_IO_ERR | G_IO_HUP,
(GIOFunc)read_process_output, widgets);
if( ! ret )
printf("Error: Can not add a watch for the output channel.\n");
g_io_channel_unref(output_channel);
-
/* Read standard error and insert in progress textview */
GIOChannel *error_channel = g_io_channel_unix_new(standard_error);
+ /* Accept binary, allow no buffering */
+ g_io_channel_set_encoding(error_channel, NULL, NULL);
+
ret = g_io_add_watch(error_channel, G_IO_IN | G_IO_ERR | G_IO_HUP,
(GIOFunc)read_process_error, widgets);
if( ! ret )
printf("Error: Can not add a watch for the error channel.\n");
diff -Nru gadmin-rsync-0.1.5/src/create_main_window.c
gadmin-rsync-0.1.6/src/create_main_window.c
--- gadmin-rsync-0.1.5/src/create_main_window.c 2009-10-24 00:27:18.000000000
+0700
+++ gadmin-rsync-0.1.6/src/create_main_window.c 2010-10-22 03:29:49.000000000
+0700
@@ -130,8 +130,8 @@
G_CALLBACK(show_help), widgets);
- /* About/Credits button */
- GtkWidget *toolbar_icon_about =
gtk_image_new_from_stock("gtk-justify-center",
+ /* About button */
+ GtkWidget *toolbar_icon_about = gtk_image_new_from_stock("gtk-about",
gtk_toolbar_get_icon_size(GTK_TOOLBAR(main_toolbar)));
GtkWidget *about_button =
gtk_toolbar_append_element(GTK_TOOLBAR(main_toolbar),
GTK_TOOLBAR_CHILD_BUTTON,
diff -Nru gadmin-rsync-0.1.5/src/create_rsync_tab.c
gadmin-rsync-0.1.6/src/create_rsync_tab.c
--- gadmin-rsync-0.1.5/src/create_rsync_tab.c 2009-11-20 17:25:23.000000000
+0700
+++ gadmin-rsync-0.1.6/src/create_rsync_tab.c 2010-10-22 03:31:01.000000000
+0700
@@ -363,7 +363,7 @@
widgets->user_settings_scrolled_window = gtk_scrolled_window_new(NULL,
NULL);
gtk_box_pack_start(GTK_BOX(user_settings_treeview_hbox),
widgets->user_settings_scrolled_window, TRUE, TRUE, 0);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(widgets->user_settings_scrolled_window),
- GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_NEVER,
GTK_POLICY_ALWAYS);
/* Must set a larger size or it wont scroll */
gtk_widget_set_size_request(widgets->user_settings_scrolled_window, -1,
100);
diff -Nru gadmin-rsync-0.1.5/src/Makefile gadmin-rsync-0.1.6/src/Makefile
--- gadmin-rsync-0.1.5/src/Makefile 2009-11-20 18:22:15.000000000 +0700
+++ gadmin-rsync-0.1.6/src/Makefile 2010-10-25 21:12:11.000000000 +0700
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# src/Makefile. Generated from Makefile.in by configure.
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -82,11 +82,11 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/missing --run
aclocal-1.11
-AMTAR = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/missing --run
tar
-AUTOCONF = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/missing
--run autoconf
-AUTOHEADER = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/missing
--run autoheader
-AUTOMAKE = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/missing
--run automake-1.11
+ACLOCAL = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/missing --run
aclocal-1.11
+AMTAR = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/missing --run
tar
+AUTOCONF = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/missing
--run autoconf
+AUTOHEADER = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/missing
--run autoheader
+AUTOMAKE = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/missing
--run automake-1.11
AWK = gawk
CATALOGS =
CATOBJEXT = .gmo
@@ -108,7 +108,7 @@
GMOFILES =
GMSGFMT = /usr/bin/msgfmt
GREP = /bin/grep
-INSTALL = /bin/install -c
+INSTALL = /usr/bin/install -c
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
@@ -121,7 +121,7 @@
LOCALSTATEDIR = /var
LTLIBOBJS =
MAINT = #
-MAKEINFO = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/missing
--run makeinfo
+MAKEINFO = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/missing
--run makeinfo
MKDIR_P = /bin/mkdir -p
MKINSTALLDIRS = ./mkinstalldirs
MSGFMT = /usr/bin/msgfmt
@@ -146,12 +146,12 @@
STRIP =
SYSCONFDIR = /etc
USE_NLS = yes
-VERSION = 0.1.5
+VERSION = 0.1.6
XGETTEXT = /usr/bin/xgettext
-abs_builddir = /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/src
-abs_srcdir = /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/src
-abs_top_builddir = /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5
-abs_top_srcdir = /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5
+abs_builddir = /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/src
+abs_srcdir = /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/src
+abs_top_builddir = /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6
+abs_top_srcdir = /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6
ac_ct_CC = gcc
am__include = include
am__leading_dot = .
@@ -178,7 +178,7 @@
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${datarootdir}/info
-install_sh = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.5/install-sh
+install_sh = ${SHELL} /root/PROJEKT/gadmin-rsync/gadmin-rsync-0.1.6/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
diff -Nru gadmin-rsync-0.1.5/src/Makefile.in gadmin-rsync-0.1.6/src/Makefile.in
--- gadmin-rsync-0.1.5/src/Makefile.in 2009-10-27 07:15:30.000000000 +0700
+++ gadmin-rsync-0.1.6/src/Makefile.in 2010-10-22 06:02:11.000000000 +0700
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff -Nru gadmin-rsync-0.1.5/src/status_update.c
gadmin-rsync-0.1.6/src/status_update.c
--- gadmin-rsync-0.1.5/src/status_update.c 2009-07-23 18:24:03.000000000
+0700
+++ gadmin-rsync-0.1.6/src/status_update.c 2010-10-22 04:19:01.000000000
+0700
@@ -99,49 +99,49 @@
int status_update(struct w *widgets)
{
char *pid;
- gchar *info, *utf8=NULL;
+ gchar *info1, *utf8=NULL;
+/* gchar *info2; for server status */
GdkColor color;
/* Check if rsync backup is running */
pid = get_process_pid("rsync");
-
if( strcmp(pid, "0") == 0 )
- client_active = 0;
+ {
+ client_active = 0;
+ info1 = g_strdup_printf(_("Status: Backup is not running."));
+ }
else
- client_active = 1;
-
+ {
+ client_active = 1;
+ info1 = g_strdup_printf(_("Status: Backup is running."));
+ }
free(pid);
/* Check if rsync daemon is running */
+/*
pid = get_process_pid("rsync --daemon");
-
if( strcmp(pid, "0") == 0 )
- server_active = 0;
+ {
+ server_active = 0;
+ info2 = g_strdup_printf(_("%s Server deactivated"), info1);
+ }
else
- server_active = 1;
-
+ {
+ server_active = 1;
+ info2 = g_strdup_printf(_("%s Server activated"), info1);
+ }
free(pid);
-
-
- if( client_active )
- info = g_strdup_printf(_("Status: Backup is running."));
- else
- info = g_strdup_printf(_("Status: Backup is not running."));
-/*
- if( client_active && ! server_active )
- info = g_strdup_printf(_("Status: Backup running. Server deactivated"));
- else
- if( ! client_active && server_active )
- info = g_strdup_printf(_("Status: Backup not running. Server
activated"));
- else
- info = g_strdup_printf(_("Status: Backup not running. Server
deactivated"));
*/
- utf8 = g_locale_to_utf8(info, strlen(info), NULL, NULL, NULL);
+ /* Server status: utf8 = g_locale_to_utf8(info, strlen(info2), NULL, NULL,
NULL); */
+ utf8 = g_locale_to_utf8(info1, strlen(info1), NULL, NULL, NULL);
gtk_label_set_text(GTK_LABEL(widgets->status_label), utf8);
if( utf8!=NULL )
g_free(utf8);
+ g_free(info1);
+/* Server status: g_free(info2); */
+
if( client_active )
{
/* Set status color */
@@ -155,7 +155,5 @@
gtk_widget_modify_fg(widgets->status_label, GTK_STATE_NORMAL, &color);
}
- g_free(info);
-
return (TRUE);
}
diff -Nru gadmin-rsync-0.1.5/TODO gadmin-rsync-0.1.6/TODO
--- gadmin-rsync-0.1.5/TODO 2009-11-20 17:30:29.000000000 +0700
+++ gadmin-rsync-0.1.6/TODO 2010-10-22 06:00:53.000000000 +0700
@@ -8,7 +8,7 @@
One exclude/include for each value in the treeview:
----------------------------------------------------
---exclude="*.tar.gz" --exclude="*.txt" --exclude="/Path"
+--exclude=".tar.gz" --exclude=".txt" --exclude="/Path"
----------------------------------------------------
Or use this instead:
@@ -30,3 +30,8 @@
Iterating main or updating the process view at an interval fixes it.
Fix: "Cancel backup". Signals all "rsync" processes as is.
+Only closing the child and channel does not make this any
+better because then previously started cron processes can
+not be shut down from the gui.
+Maybe it should be done both ways with an option not to
+kill the background processes.
signature.asc
Description: OpenPGP digital signature
