Compare commits

..

No commits in common. "476f3115591ebfe621983ebc0c81da7dd490103c" and "721632baf842407d073e169c2010e29350f3db0d" have entirely different histories.

5 changed files with 15 additions and 19 deletions

View File

@ -1,8 +1,3 @@
gcp 0.2.1 (2019-03-10, Matteo Cypriani):
- fix deprecation warnings with dbus.glib
see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923677
- minor documentation (README) improvements
gcp 0.2.0 (2018-10-14, Matteo Cypriani): gcp 0.2.0 (2018-10-14, Matteo Cypriani):
- actually switch to Python3 - actually switch to Python3
- cp compatibibility: - cp compatibibility:

2
fr.po
View File

@ -8,7 +8,7 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.2.1\n" "Project-Id-Version: 0.2.1.dev1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-09-30 18:05+0800\n" "POT-Creation-Date: 2010-09-30 18:05+0800\n"
"PO-Revision-Date: 2018-10-14 20:56+0200\n" "PO-Revision-Date: 2018-10-14 20:56+0200\n"

23
gcp
View File

@ -5,7 +5,7 @@ gcp: Gcp CoPier
Copyright (c) 2010, 2011 Jérôme Poisson <goffi@goffi.org> Copyright (c) 2010, 2011 Jérôme Poisson <goffi@goffi.org>
(c) 2011 Thomas Preud'homme <robotux@celest.fr> (c) 2011 Thomas Preud'homme <robotux@celest.fr>
(c) 2016 Jingbei Li <i@jingbei.li> (c) 2016 Jingbei Li <i@jingbei.li>
(c) 2018, 2019 Matteo Cypriani <mcy@lm7.fr> (c) 2018 Matteo Cypriani <mcy@lm7.fr>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -36,11 +36,12 @@ logging.basicConfig(level=logging.INFO, format='%(message)s')
gettext.install('gcp', "i18n") gettext.install('gcp', "i18n")
try: try:
from gi.repository import GLib from gi.repository import GObject
from dbus.mainloop.glib import DBusGMainLoop #DBus
DBusGMainLoop(set_as_default=True)
import dbus.service
import dbus import dbus
import dbus.glib
import dbus.service
import dbus.mainloop.glib
except ImportError as e: except ImportError as e:
error(_("Error during import")) error(_("Error during import"))
error(_("Please check dependecies:"), e) error(_("Please check dependecies:"), e)
@ -56,7 +57,7 @@ except ImportError as e:
NAME = "gcp (Gcp CoPier)" NAME = "gcp (Gcp CoPier)"
NAME_SHORT = "gcp" NAME_SHORT = "gcp"
VERSION = '0.2.1' VERSION = '0.2.1.dev1'
ABOUT = NAME_SHORT + " " + VERSION + """ ABOUT = NAME_SHORT + " " + VERSION + """
--- ---
@ -358,9 +359,9 @@ class GCP():
source_fd.close() source_fd.close()
return True return True
GLib.io_add_watch(source_fd, GLib.IO_IN,self._copyFile, GObject.io_add_watch(source_fd, GObject.IO_IN,self._copyFile,
(dest_fd, options), (dest_fd, options),
priority=GLib.PRIORITY_DEFAULT) priority=GObject.PRIORITY_DEFAULT)
if not self.progress: if not self.progress:
info(_("COPYING %(source)s ==> %(dest)s") info(_("COPYING %(source)s ==> %(dest)s")
% {"source":source_file, "dest":dest_file}) % {"source":source_file, "dest":dest_file})
@ -717,7 +718,7 @@ class GCP():
self.__checkArgs(options, source_dir, args) self.__checkArgs(options, source_dir, args)
if not self.__launched: if not self.__launched:
self.journal = Journal() self.journal = Journal()
GLib.idle_add(self.__copyNextFile) GObject.idle_add(self.__copyNextFile)
self.__launched = True self.__launched = True
return (True,'') return (True,'')
@ -727,7 +728,7 @@ class GCP():
def go(self): def go(self):
"""Launch main loop""" """Launch main loop"""
self.loop = GLib.MainLoop() self.loop = GObject.MainLoop()
try: try:
self.loop.run() self.loop.run()
except KeyboardInterrupt: except KeyboardInterrupt:

View File

@ -5,7 +5,7 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.2.1\n" "Project-Id-Version: 0.2.1.dev1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-14 20:51+0200\n" "POT-Creation-Date: 2018-10-14 20:51+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

View File

@ -6,7 +6,7 @@ name = 'gcp'
setuptools.setup( setuptools.setup(
name=name, name=name,
version='0.2.1', version='0.2.1.dev1',
url='https://code.lm7.fr/mcy/gcp', url='https://code.lm7.fr/mcy/gcp',
license='GPL-3+', license='GPL-3+',