From 68a57e7c917244be40d569700f09ab67f11db45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Tue, 20 Jun 2017 23:07:28 +0200 Subject: [PATCH 1/2] Replace src by gajim --- Makefile.am | 2 +- autogen.sh | 4 ++-- configure.ac | 6 +++--- doc/epydoc.conf | 2 +- launch.sh | 2 +- plugins/dbus_plugin/plugin.py | 2 +- scripts/dev/run-pylint.py | 2 +- test/integration/test_gui_event_integration.py | 2 +- test/lib/__init__.py | 4 ++-- test/lib/xmpp_mocks.py | 2 +- test/test_pluginmanager.py | 2 +- win/misc/create-launcher.py | 6 +++--- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile.am b/Makefile.am index 95772dfeb..41ef7069d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src data po icons plugins +SUBDIRS = gajim data po icons plugins ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh index 80ea3525a..72fbe878a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -6,9 +6,9 @@ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ && ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \ - src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ + gajim/*.py gajim/common/*.py gajim/command_system/*.py gajim/command_system/implementation/*.py gajim/common/zeroconf/*.py gajim/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ - && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 + && echo -e "data/org.gajim.Gajim.desktop.in\ndata/gajim-remote.desktop.in\ngajim/ipython_view.py" > po/POTFILES.skip || exit 1 if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then ls -1 plugins/*/*.py plugins/*/*.ui >> po/POTFILES.skip fi diff --git a/configure.ac b/configure.ac index b7ecb3d27..857357e1a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([Gajim - A Jabber Instant Messager], - m4_esyscmd_s([python -c "import os;os.chdir('src');from common import defs; print(defs.version)"]),[https://dev.gajim.org/gajim/gajim],[gajim]) + m4_esyscmd_s([python -c "import os;os.chdir('gajim');from common import defs; print(defs.version)"]),[https://dev.gajim.org/gajim/gajim],[gajim]) AC_PREREQ([2.59]) AC_CONFIG_HEADER(config.h) @@ -48,7 +48,7 @@ instead of DATADIR/gajim/src.])] , AC_SUBST([gajim_srcdir], [\${pkgpythondir}]) , -AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/src]) +AC_SUBST([gajim_srcdir], [\${datadir}/\${PACKAGE}/gajim]) ) AC_SUBST([gajim_pluginsdir], [\${datadir}/\${PACKAGE}/plugins]) @@ -76,7 +76,7 @@ AC_CONFIG_FILES([ data/org.gajim.Gajim.desktop.in data/gajim-remote.desktop.in data/defs.py - src/Makefile + gajim/Makefile scripts/gajim scripts/gajim-remote:scripts/gajim.in scripts/gajim-history-manager:scripts/gajim.in diff --git a/doc/epydoc.conf b/doc/epydoc.conf index f58ddfcd4..258c2fc3e 100644 --- a/doc/epydoc.conf +++ b/doc/epydoc.conf @@ -13,7 +13,7 @@ docformat: restructuredtext # The list of modules to document. Modules can be named using # dotted names, module filenames, or package directory names. # This option may be repeated. -modules: src/* test/* +modules: gajim/* test/* # Write html output to the directory "apidocs" #output: pdf diff --git a/launch.sh b/launch.sh index ad7265660..b0339c655 100755 --- a/launch.sh +++ b/launch.sh @@ -2,5 +2,5 @@ if [ ! $PYTHON ]; then PYTHON="python3"; fi -cd "$(dirname $0)/src" +cd "$(dirname $0)/gajim" exec $PYTHON -OOt gajim.py "$@" diff --git a/plugins/dbus_plugin/plugin.py b/plugins/dbus_plugin/plugin.py index 562c9d69c..1f6001e99 100644 --- a/plugins/dbus_plugin/plugin.py +++ b/plugins/dbus_plugin/plugin.py @@ -26,7 +26,7 @@ ''' D-BUS Support plugin. -Based on src/remote_control.py +Based on gajim/remote_control.py :author: Mateusz Biliński :since: 8th August 2008 diff --git a/scripts/dev/run-pylint.py b/scripts/dev/run-pylint.py index e2d54b14c..1d4113973 100755 --- a/scripts/dev/run-pylint.py +++ b/scripts/dev/run-pylint.py @@ -5,6 +5,6 @@ import os import sys if os.getcwd().endswith('dev'): - os.chdir('../../src/') # we were in scripts/dev + os.chdir('../../gajim/') # we were in scripts/dev os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:])) diff --git a/test/integration/test_gui_event_integration.py b/test/integration/test_gui_event_integration.py index 06b8d638e..c0a20142c 100644 --- a/test/integration/test_gui_event_integration.py +++ b/test/integration/test_gui_event_integration.py @@ -1,5 +1,5 @@ ''' -Tests for the miscellaneous functions scattered throughout src/gajim.py +Tests for the miscellaneous functions scattered throughout gajim/gajim.py ''' import unittest diff --git a/test/lib/__init__.py b/test/lib/__init__.py index e941e220a..803472b12 100644 --- a/test/lib/__init__.py +++ b/test/lib/__init__.py @@ -12,9 +12,9 @@ for o, a in opts: gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..') -# look for modules in the CWD, then gajim/test/lib, then gajim/src, +# look for modules in the CWD, then gajim/test/lib, then gajim/gajim, # then everywhere else -sys.path.insert(1, gajim_root + '/src') +sys.path.insert(1, gajim_root + '/gajim') sys.path.insert(1, gajim_root + '/test/lib') # a temporary version of ~/.gajim for testing diff --git a/test/lib/xmpp_mocks.py b/test/lib/xmpp_mocks.py index 81ba75d04..6617e27ae 100644 --- a/test/lib/xmpp_mocks.py +++ b/test/lib/xmpp_mocks.py @@ -57,7 +57,7 @@ class IdleMock: class MockConnection(IdleMock, Mock): ''' - Class simulating Connection class from src/common/connection.py + Class simulating Connection class from gajim/common/connection.py It is derived from Mock in order to avoid defining all methods from real Connection that are called from NBClient or Dispatcher diff --git a/test/test_pluginmanager.py b/test/test_pluginmanager.py index acbf2896b..dba5152f3 100644 --- a/test/test_pluginmanager.py +++ b/test/test_pluginmanager.py @@ -30,7 +30,7 @@ import os import unittest gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') -sys.path.append(gajim_root + '/src') +sys.path.append(gajim_root + '/gajim') # a temporary version of ~/.gajim for testing configdir = gajim_root + '/test/tmp' diff --git a/win/misc/create-launcher.py b/win/misc/create-launcher.py index e625a5295..83f83c22f 100644 --- a/win/misc/create-launcher.py +++ b/win/misc/create-launcher.py @@ -87,13 +87,13 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, Py_FrozenFlag = 1; Py_Initialize(); PySys_SetArgvEx(__argc, szArglist, 0); - FILE* file = fopen("../gajim/src/%(filename)s", "r"); + FILE* file = fopen("../gajim/gajim/%(filename)s", "r"); PyRun_SimpleString("import sys; import os;" - "os.chdir('../gajim/src');" + "os.chdir('../gajim/gajim');" "sys.path.append(os.getcwd());" "sys.frozen=True;" ); - result = PyRun_SimpleFile(file, "../gajim/src/%(filename)s"); + result = PyRun_SimpleFile(file, "../gajim/gajim/%(filename)s"); Py_Finalize(); return result; } From 125ce523e44f11620de2cb09c55bce95d03f0993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Tue, 20 Jun 2017 23:09:12 +0200 Subject: [PATCH 2/2] Rename src directory --- {src => gajim}/Makefile.am | 0 {src => gajim}/adhoc_commands.py | 0 {src => gajim}/advanced_configuration_window.py | 0 {src => gajim}/app_actions.py | 0 {src => gajim}/atom_window.py | 0 {src => gajim}/cell_renderer_image.py | 0 {src => gajim}/chat_control.py | 0 {src => gajim}/chat_control_base.py | 0 {src => gajim}/command_system/__init__.py | 0 {src => gajim}/command_system/dispatcher.py | 0 {src => gajim}/command_system/errors.py | 0 {src => gajim}/command_system/framework.py | 0 {src => gajim}/command_system/implementation/__init__.py | 0 {src => gajim}/command_system/implementation/custom.py | 0 {src => gajim}/command_system/implementation/execute.py | 0 {src => gajim}/command_system/implementation/hosts.py | 0 {src => gajim}/command_system/implementation/middleware.py | 0 {src => gajim}/command_system/implementation/standard.py | 0 {src => gajim}/command_system/mapping.py | 0 {src => gajim}/command_system/tools.py | 0 {src => gajim}/common/__init__.py | 0 {src => gajim}/common/account.py | 0 {src => gajim}/common/atom.py | 0 {src => gajim}/common/caps_cache.py | 0 {src => gajim}/common/check_X509.py | 0 {src => gajim}/common/check_paths.py | 0 {src => gajim}/common/commands.py | 0 {src => gajim}/common/config.py | 0 {src => gajim}/common/configpaths.py | 0 {src => gajim}/common/connection.py | 0 {src => gajim}/common/connection_handlers.py | 0 {src => gajim}/common/connection_handlers_events.py | 0 {src => gajim}/common/contacts.py | 0 {src => gajim}/common/crypto.py | 0 {src => gajim}/common/dataforms.py | 0 {src => gajim}/common/dbus_support.py | 0 {src => gajim}/common/defs.py | 0 {src => gajim}/common/dh.py | 0 {src => gajim}/common/events.py | 0 {src => gajim}/common/exceptions.py | 0 {src => gajim}/common/file_props.py | 0 {src => gajim}/common/fuzzyclock.py | 0 {src => gajim}/common/gajim.py | 0 {src => gajim}/common/ged.py | 0 {src => gajim}/common/gpg.py | 0 {src => gajim}/common/helpers.py | 0 {src => gajim}/common/i18n.py | 0 {src => gajim}/common/idle.py | 0 {src => gajim}/common/jingle.py | 0 {src => gajim}/common/jingle_content.py | 0 {src => gajim}/common/jingle_ft.py | 0 {src => gajim}/common/jingle_ftstates.py | 0 {src => gajim}/common/jingle_rtp.py | 0 {src => gajim}/common/jingle_session.py | 0 {src => gajim}/common/jingle_transport.py | 0 {src => gajim}/common/jingle_xtls.py | 0 {src => gajim}/common/location_listener.py | 0 {src => gajim}/common/logger.py | 0 {src => gajim}/common/logging_helpers.py | 0 {src => gajim}/common/message_archiving.py | 0 {src => gajim}/common/multimedia_helpers.py | 0 {src => gajim}/common/nec.py | 0 {src => gajim}/common/optparser.py | 0 {src => gajim}/common/passwords.py | 0 {src => gajim}/common/pep.py | 0 {src => gajim}/common/protocol/__init__.py | 0 {src => gajim}/common/protocol/bytestream.py | 0 {src => gajim}/common/protocol/caps.py | 0 {src => gajim}/common/proxy65_manager.py | 0 {src => gajim}/common/pubsub.py | 0 {src => gajim}/common/resolver.py | 0 {src => gajim}/common/rst_xhtml_generator.py | 0 {src => gajim}/common/sleepy.py | 0 {src => gajim}/common/socks5.py | 0 {src => gajim}/common/stanza_session.py | 0 {src => gajim}/common/zeroconf/__init__.py | 0 {src => gajim}/common/zeroconf/client_zeroconf.py | 0 {src => gajim}/common/zeroconf/connection_handlers_zeroconf.py | 0 {src => gajim}/common/zeroconf/connection_zeroconf.py | 0 {src => gajim}/common/zeroconf/roster_zeroconf.py | 0 {src => gajim}/common/zeroconf/zeroconf.py | 0 {src => gajim}/common/zeroconf/zeroconf_avahi.py | 0 {src => gajim}/common/zeroconf/zeroconf_bonjour.py | 0 {src => gajim}/config.py | 0 {src => gajim}/conversation_textview.py | 0 {src => gajim}/dataforms_widget.py | 0 {src => gajim}/dialogs.py | 0 {src => gajim}/disco.py | 0 {src => gajim}/features_window.py | 0 {src => gajim}/filetransfers_window.py | 0 {src => gajim}/gajim-remote.py | 0 {src => gajim}/gajim.py | 0 {src => gajim}/gajim_themes_window.py | 0 {src => gajim}/groupchat_control.py | 0 {src => gajim}/groups.py | 0 {src => gajim}/gtkexcepthook.py | 0 {src => gajim}/gtkgui_helpers.py | 0 {src => gajim}/gtkspell.py | 0 {src => gajim}/gui_interface.py | 0 {src => gajim}/gui_menu_builder.py | 0 {src => gajim}/history_manager.py | 0 {src => gajim}/history_window.py | 0 {src => gajim}/htmltextview.py | 0 {src => gajim}/ipython_view.py | 0 {src => gajim}/logind_listener.py | 0 {src => gajim}/message_control.py | 0 {src => gajim}/message_textview.py | 0 {src => gajim}/message_window.py | 0 {src => gajim}/music_track_listener.py | 0 {src => gajim}/negotiation.py | 0 {src => gajim}/network_watcher.py | 0 {src => gajim}/notify.py | 0 {src => gajim}/plugins/__init__.py | 0 {src => gajim}/plugins/gajimplugin.py | 0 {src => gajim}/plugins/gui.py | 0 {src => gajim}/plugins/helpers.py | 0 {src => gajim}/plugins/pluginmanager.py | 0 {src => gajim}/plugins/plugins_i18n.py | 0 {src => gajim}/profile_window.py | 0 {src => gajim}/pylint.rc | 0 {src => gajim}/remote_control.py | 0 {src => gajim}/roster_window.py | 0 {src => gajim}/search_window.py | 0 {src => gajim}/secrets.py | 0 {src => gajim}/session.py | 0 {src => gajim}/shortcuts_window.py | 0 {src => gajim}/statusicon.py | 0 {src => gajim}/tooltips.py | 0 {src => gajim}/upower_listener.py | 0 {src => gajim}/vcard.py | 0 130 files changed, 0 insertions(+), 0 deletions(-) rename {src => gajim}/Makefile.am (100%) rename {src => gajim}/adhoc_commands.py (100%) rename {src => gajim}/advanced_configuration_window.py (100%) rename {src => gajim}/app_actions.py (100%) rename {src => gajim}/atom_window.py (100%) rename {src => gajim}/cell_renderer_image.py (100%) rename {src => gajim}/chat_control.py (100%) rename {src => gajim}/chat_control_base.py (100%) rename {src => gajim}/command_system/__init__.py (100%) rename {src => gajim}/command_system/dispatcher.py (100%) rename {src => gajim}/command_system/errors.py (100%) rename {src => gajim}/command_system/framework.py (100%) rename {src => gajim}/command_system/implementation/__init__.py (100%) rename {src => gajim}/command_system/implementation/custom.py (100%) rename {src => gajim}/command_system/implementation/execute.py (100%) rename {src => gajim}/command_system/implementation/hosts.py (100%) rename {src => gajim}/command_system/implementation/middleware.py (100%) rename {src => gajim}/command_system/implementation/standard.py (100%) rename {src => gajim}/command_system/mapping.py (100%) rename {src => gajim}/command_system/tools.py (100%) rename {src => gajim}/common/__init__.py (100%) rename {src => gajim}/common/account.py (100%) rename {src => gajim}/common/atom.py (100%) rename {src => gajim}/common/caps_cache.py (100%) rename {src => gajim}/common/check_X509.py (100%) rename {src => gajim}/common/check_paths.py (100%) rename {src => gajim}/common/commands.py (100%) rename {src => gajim}/common/config.py (100%) rename {src => gajim}/common/configpaths.py (100%) rename {src => gajim}/common/connection.py (100%) rename {src => gajim}/common/connection_handlers.py (100%) rename {src => gajim}/common/connection_handlers_events.py (100%) rename {src => gajim}/common/contacts.py (100%) rename {src => gajim}/common/crypto.py (100%) rename {src => gajim}/common/dataforms.py (100%) rename {src => gajim}/common/dbus_support.py (100%) rename {src => gajim}/common/defs.py (100%) rename {src => gajim}/common/dh.py (100%) rename {src => gajim}/common/events.py (100%) rename {src => gajim}/common/exceptions.py (100%) rename {src => gajim}/common/file_props.py (100%) rename {src => gajim}/common/fuzzyclock.py (100%) rename {src => gajim}/common/gajim.py (100%) rename {src => gajim}/common/ged.py (100%) rename {src => gajim}/common/gpg.py (100%) rename {src => gajim}/common/helpers.py (100%) rename {src => gajim}/common/i18n.py (100%) rename {src => gajim}/common/idle.py (100%) rename {src => gajim}/common/jingle.py (100%) rename {src => gajim}/common/jingle_content.py (100%) rename {src => gajim}/common/jingle_ft.py (100%) rename {src => gajim}/common/jingle_ftstates.py (100%) rename {src => gajim}/common/jingle_rtp.py (100%) rename {src => gajim}/common/jingle_session.py (100%) rename {src => gajim}/common/jingle_transport.py (100%) rename {src => gajim}/common/jingle_xtls.py (100%) rename {src => gajim}/common/location_listener.py (100%) rename {src => gajim}/common/logger.py (100%) rename {src => gajim}/common/logging_helpers.py (100%) rename {src => gajim}/common/message_archiving.py (100%) rename {src => gajim}/common/multimedia_helpers.py (100%) rename {src => gajim}/common/nec.py (100%) rename {src => gajim}/common/optparser.py (100%) rename {src => gajim}/common/passwords.py (100%) rename {src => gajim}/common/pep.py (100%) rename {src => gajim}/common/protocol/__init__.py (100%) rename {src => gajim}/common/protocol/bytestream.py (100%) rename {src => gajim}/common/protocol/caps.py (100%) rename {src => gajim}/common/proxy65_manager.py (100%) rename {src => gajim}/common/pubsub.py (100%) rename {src => gajim}/common/resolver.py (100%) rename {src => gajim}/common/rst_xhtml_generator.py (100%) rename {src => gajim}/common/sleepy.py (100%) rename {src => gajim}/common/socks5.py (100%) rename {src => gajim}/common/stanza_session.py (100%) rename {src => gajim}/common/zeroconf/__init__.py (100%) rename {src => gajim}/common/zeroconf/client_zeroconf.py (100%) rename {src => gajim}/common/zeroconf/connection_handlers_zeroconf.py (100%) rename {src => gajim}/common/zeroconf/connection_zeroconf.py (100%) rename {src => gajim}/common/zeroconf/roster_zeroconf.py (100%) rename {src => gajim}/common/zeroconf/zeroconf.py (100%) rename {src => gajim}/common/zeroconf/zeroconf_avahi.py (100%) rename {src => gajim}/common/zeroconf/zeroconf_bonjour.py (100%) rename {src => gajim}/config.py (100%) rename {src => gajim}/conversation_textview.py (100%) rename {src => gajim}/dataforms_widget.py (100%) rename {src => gajim}/dialogs.py (100%) rename {src => gajim}/disco.py (100%) rename {src => gajim}/features_window.py (100%) rename {src => gajim}/filetransfers_window.py (100%) rename {src => gajim}/gajim-remote.py (100%) rename {src => gajim}/gajim.py (100%) rename {src => gajim}/gajim_themes_window.py (100%) rename {src => gajim}/groupchat_control.py (100%) rename {src => gajim}/groups.py (100%) rename {src => gajim}/gtkexcepthook.py (100%) rename {src => gajim}/gtkgui_helpers.py (100%) rename {src => gajim}/gtkspell.py (100%) rename {src => gajim}/gui_interface.py (100%) rename {src => gajim}/gui_menu_builder.py (100%) rename {src => gajim}/history_manager.py (100%) rename {src => gajim}/history_window.py (100%) rename {src => gajim}/htmltextview.py (100%) rename {src => gajim}/ipython_view.py (100%) rename {src => gajim}/logind_listener.py (100%) rename {src => gajim}/message_control.py (100%) rename {src => gajim}/message_textview.py (100%) rename {src => gajim}/message_window.py (100%) rename {src => gajim}/music_track_listener.py (100%) rename {src => gajim}/negotiation.py (100%) rename {src => gajim}/network_watcher.py (100%) rename {src => gajim}/notify.py (100%) rename {src => gajim}/plugins/__init__.py (100%) rename {src => gajim}/plugins/gajimplugin.py (100%) rename {src => gajim}/plugins/gui.py (100%) rename {src => gajim}/plugins/helpers.py (100%) rename {src => gajim}/plugins/pluginmanager.py (100%) rename {src => gajim}/plugins/plugins_i18n.py (100%) rename {src => gajim}/profile_window.py (100%) rename {src => gajim}/pylint.rc (100%) rename {src => gajim}/remote_control.py (100%) rename {src => gajim}/roster_window.py (100%) rename {src => gajim}/search_window.py (100%) rename {src => gajim}/secrets.py (100%) rename {src => gajim}/session.py (100%) rename {src => gajim}/shortcuts_window.py (100%) rename {src => gajim}/statusicon.py (100%) rename {src => gajim}/tooltips.py (100%) rename {src => gajim}/upower_listener.py (100%) rename {src => gajim}/vcard.py (100%) diff --git a/src/Makefile.am b/gajim/Makefile.am similarity index 100% rename from src/Makefile.am rename to gajim/Makefile.am diff --git a/src/adhoc_commands.py b/gajim/adhoc_commands.py similarity index 100% rename from src/adhoc_commands.py rename to gajim/adhoc_commands.py diff --git a/src/advanced_configuration_window.py b/gajim/advanced_configuration_window.py similarity index 100% rename from src/advanced_configuration_window.py rename to gajim/advanced_configuration_window.py diff --git a/src/app_actions.py b/gajim/app_actions.py similarity index 100% rename from src/app_actions.py rename to gajim/app_actions.py diff --git a/src/atom_window.py b/gajim/atom_window.py similarity index 100% rename from src/atom_window.py rename to gajim/atom_window.py diff --git a/src/cell_renderer_image.py b/gajim/cell_renderer_image.py similarity index 100% rename from src/cell_renderer_image.py rename to gajim/cell_renderer_image.py diff --git a/src/chat_control.py b/gajim/chat_control.py similarity index 100% rename from src/chat_control.py rename to gajim/chat_control.py diff --git a/src/chat_control_base.py b/gajim/chat_control_base.py similarity index 100% rename from src/chat_control_base.py rename to gajim/chat_control_base.py diff --git a/src/command_system/__init__.py b/gajim/command_system/__init__.py similarity index 100% rename from src/command_system/__init__.py rename to gajim/command_system/__init__.py diff --git a/src/command_system/dispatcher.py b/gajim/command_system/dispatcher.py similarity index 100% rename from src/command_system/dispatcher.py rename to gajim/command_system/dispatcher.py diff --git a/src/command_system/errors.py b/gajim/command_system/errors.py similarity index 100% rename from src/command_system/errors.py rename to gajim/command_system/errors.py diff --git a/src/command_system/framework.py b/gajim/command_system/framework.py similarity index 100% rename from src/command_system/framework.py rename to gajim/command_system/framework.py diff --git a/src/command_system/implementation/__init__.py b/gajim/command_system/implementation/__init__.py similarity index 100% rename from src/command_system/implementation/__init__.py rename to gajim/command_system/implementation/__init__.py diff --git a/src/command_system/implementation/custom.py b/gajim/command_system/implementation/custom.py similarity index 100% rename from src/command_system/implementation/custom.py rename to gajim/command_system/implementation/custom.py diff --git a/src/command_system/implementation/execute.py b/gajim/command_system/implementation/execute.py similarity index 100% rename from src/command_system/implementation/execute.py rename to gajim/command_system/implementation/execute.py diff --git a/src/command_system/implementation/hosts.py b/gajim/command_system/implementation/hosts.py similarity index 100% rename from src/command_system/implementation/hosts.py rename to gajim/command_system/implementation/hosts.py diff --git a/src/command_system/implementation/middleware.py b/gajim/command_system/implementation/middleware.py similarity index 100% rename from src/command_system/implementation/middleware.py rename to gajim/command_system/implementation/middleware.py diff --git a/src/command_system/implementation/standard.py b/gajim/command_system/implementation/standard.py similarity index 100% rename from src/command_system/implementation/standard.py rename to gajim/command_system/implementation/standard.py diff --git a/src/command_system/mapping.py b/gajim/command_system/mapping.py similarity index 100% rename from src/command_system/mapping.py rename to gajim/command_system/mapping.py diff --git a/src/command_system/tools.py b/gajim/command_system/tools.py similarity index 100% rename from src/command_system/tools.py rename to gajim/command_system/tools.py diff --git a/src/common/__init__.py b/gajim/common/__init__.py similarity index 100% rename from src/common/__init__.py rename to gajim/common/__init__.py diff --git a/src/common/account.py b/gajim/common/account.py similarity index 100% rename from src/common/account.py rename to gajim/common/account.py diff --git a/src/common/atom.py b/gajim/common/atom.py similarity index 100% rename from src/common/atom.py rename to gajim/common/atom.py diff --git a/src/common/caps_cache.py b/gajim/common/caps_cache.py similarity index 100% rename from src/common/caps_cache.py rename to gajim/common/caps_cache.py diff --git a/src/common/check_X509.py b/gajim/common/check_X509.py similarity index 100% rename from src/common/check_X509.py rename to gajim/common/check_X509.py diff --git a/src/common/check_paths.py b/gajim/common/check_paths.py similarity index 100% rename from src/common/check_paths.py rename to gajim/common/check_paths.py diff --git a/src/common/commands.py b/gajim/common/commands.py similarity index 100% rename from src/common/commands.py rename to gajim/common/commands.py diff --git a/src/common/config.py b/gajim/common/config.py similarity index 100% rename from src/common/config.py rename to gajim/common/config.py diff --git a/src/common/configpaths.py b/gajim/common/configpaths.py similarity index 100% rename from src/common/configpaths.py rename to gajim/common/configpaths.py diff --git a/src/common/connection.py b/gajim/common/connection.py similarity index 100% rename from src/common/connection.py rename to gajim/common/connection.py diff --git a/src/common/connection_handlers.py b/gajim/common/connection_handlers.py similarity index 100% rename from src/common/connection_handlers.py rename to gajim/common/connection_handlers.py diff --git a/src/common/connection_handlers_events.py b/gajim/common/connection_handlers_events.py similarity index 100% rename from src/common/connection_handlers_events.py rename to gajim/common/connection_handlers_events.py diff --git a/src/common/contacts.py b/gajim/common/contacts.py similarity index 100% rename from src/common/contacts.py rename to gajim/common/contacts.py diff --git a/src/common/crypto.py b/gajim/common/crypto.py similarity index 100% rename from src/common/crypto.py rename to gajim/common/crypto.py diff --git a/src/common/dataforms.py b/gajim/common/dataforms.py similarity index 100% rename from src/common/dataforms.py rename to gajim/common/dataforms.py diff --git a/src/common/dbus_support.py b/gajim/common/dbus_support.py similarity index 100% rename from src/common/dbus_support.py rename to gajim/common/dbus_support.py diff --git a/src/common/defs.py b/gajim/common/defs.py similarity index 100% rename from src/common/defs.py rename to gajim/common/defs.py diff --git a/src/common/dh.py b/gajim/common/dh.py similarity index 100% rename from src/common/dh.py rename to gajim/common/dh.py diff --git a/src/common/events.py b/gajim/common/events.py similarity index 100% rename from src/common/events.py rename to gajim/common/events.py diff --git a/src/common/exceptions.py b/gajim/common/exceptions.py similarity index 100% rename from src/common/exceptions.py rename to gajim/common/exceptions.py diff --git a/src/common/file_props.py b/gajim/common/file_props.py similarity index 100% rename from src/common/file_props.py rename to gajim/common/file_props.py diff --git a/src/common/fuzzyclock.py b/gajim/common/fuzzyclock.py similarity index 100% rename from src/common/fuzzyclock.py rename to gajim/common/fuzzyclock.py diff --git a/src/common/gajim.py b/gajim/common/gajim.py similarity index 100% rename from src/common/gajim.py rename to gajim/common/gajim.py diff --git a/src/common/ged.py b/gajim/common/ged.py similarity index 100% rename from src/common/ged.py rename to gajim/common/ged.py diff --git a/src/common/gpg.py b/gajim/common/gpg.py similarity index 100% rename from src/common/gpg.py rename to gajim/common/gpg.py diff --git a/src/common/helpers.py b/gajim/common/helpers.py similarity index 100% rename from src/common/helpers.py rename to gajim/common/helpers.py diff --git a/src/common/i18n.py b/gajim/common/i18n.py similarity index 100% rename from src/common/i18n.py rename to gajim/common/i18n.py diff --git a/src/common/idle.py b/gajim/common/idle.py similarity index 100% rename from src/common/idle.py rename to gajim/common/idle.py diff --git a/src/common/jingle.py b/gajim/common/jingle.py similarity index 100% rename from src/common/jingle.py rename to gajim/common/jingle.py diff --git a/src/common/jingle_content.py b/gajim/common/jingle_content.py similarity index 100% rename from src/common/jingle_content.py rename to gajim/common/jingle_content.py diff --git a/src/common/jingle_ft.py b/gajim/common/jingle_ft.py similarity index 100% rename from src/common/jingle_ft.py rename to gajim/common/jingle_ft.py diff --git a/src/common/jingle_ftstates.py b/gajim/common/jingle_ftstates.py similarity index 100% rename from src/common/jingle_ftstates.py rename to gajim/common/jingle_ftstates.py diff --git a/src/common/jingle_rtp.py b/gajim/common/jingle_rtp.py similarity index 100% rename from src/common/jingle_rtp.py rename to gajim/common/jingle_rtp.py diff --git a/src/common/jingle_session.py b/gajim/common/jingle_session.py similarity index 100% rename from src/common/jingle_session.py rename to gajim/common/jingle_session.py diff --git a/src/common/jingle_transport.py b/gajim/common/jingle_transport.py similarity index 100% rename from src/common/jingle_transport.py rename to gajim/common/jingle_transport.py diff --git a/src/common/jingle_xtls.py b/gajim/common/jingle_xtls.py similarity index 100% rename from src/common/jingle_xtls.py rename to gajim/common/jingle_xtls.py diff --git a/src/common/location_listener.py b/gajim/common/location_listener.py similarity index 100% rename from src/common/location_listener.py rename to gajim/common/location_listener.py diff --git a/src/common/logger.py b/gajim/common/logger.py similarity index 100% rename from src/common/logger.py rename to gajim/common/logger.py diff --git a/src/common/logging_helpers.py b/gajim/common/logging_helpers.py similarity index 100% rename from src/common/logging_helpers.py rename to gajim/common/logging_helpers.py diff --git a/src/common/message_archiving.py b/gajim/common/message_archiving.py similarity index 100% rename from src/common/message_archiving.py rename to gajim/common/message_archiving.py diff --git a/src/common/multimedia_helpers.py b/gajim/common/multimedia_helpers.py similarity index 100% rename from src/common/multimedia_helpers.py rename to gajim/common/multimedia_helpers.py diff --git a/src/common/nec.py b/gajim/common/nec.py similarity index 100% rename from src/common/nec.py rename to gajim/common/nec.py diff --git a/src/common/optparser.py b/gajim/common/optparser.py similarity index 100% rename from src/common/optparser.py rename to gajim/common/optparser.py diff --git a/src/common/passwords.py b/gajim/common/passwords.py similarity index 100% rename from src/common/passwords.py rename to gajim/common/passwords.py diff --git a/src/common/pep.py b/gajim/common/pep.py similarity index 100% rename from src/common/pep.py rename to gajim/common/pep.py diff --git a/src/common/protocol/__init__.py b/gajim/common/protocol/__init__.py similarity index 100% rename from src/common/protocol/__init__.py rename to gajim/common/protocol/__init__.py diff --git a/src/common/protocol/bytestream.py b/gajim/common/protocol/bytestream.py similarity index 100% rename from src/common/protocol/bytestream.py rename to gajim/common/protocol/bytestream.py diff --git a/src/common/protocol/caps.py b/gajim/common/protocol/caps.py similarity index 100% rename from src/common/protocol/caps.py rename to gajim/common/protocol/caps.py diff --git a/src/common/proxy65_manager.py b/gajim/common/proxy65_manager.py similarity index 100% rename from src/common/proxy65_manager.py rename to gajim/common/proxy65_manager.py diff --git a/src/common/pubsub.py b/gajim/common/pubsub.py similarity index 100% rename from src/common/pubsub.py rename to gajim/common/pubsub.py diff --git a/src/common/resolver.py b/gajim/common/resolver.py similarity index 100% rename from src/common/resolver.py rename to gajim/common/resolver.py diff --git a/src/common/rst_xhtml_generator.py b/gajim/common/rst_xhtml_generator.py similarity index 100% rename from src/common/rst_xhtml_generator.py rename to gajim/common/rst_xhtml_generator.py diff --git a/src/common/sleepy.py b/gajim/common/sleepy.py similarity index 100% rename from src/common/sleepy.py rename to gajim/common/sleepy.py diff --git a/src/common/socks5.py b/gajim/common/socks5.py similarity index 100% rename from src/common/socks5.py rename to gajim/common/socks5.py diff --git a/src/common/stanza_session.py b/gajim/common/stanza_session.py similarity index 100% rename from src/common/stanza_session.py rename to gajim/common/stanza_session.py diff --git a/src/common/zeroconf/__init__.py b/gajim/common/zeroconf/__init__.py similarity index 100% rename from src/common/zeroconf/__init__.py rename to gajim/common/zeroconf/__init__.py diff --git a/src/common/zeroconf/client_zeroconf.py b/gajim/common/zeroconf/client_zeroconf.py similarity index 100% rename from src/common/zeroconf/client_zeroconf.py rename to gajim/common/zeroconf/client_zeroconf.py diff --git a/src/common/zeroconf/connection_handlers_zeroconf.py b/gajim/common/zeroconf/connection_handlers_zeroconf.py similarity index 100% rename from src/common/zeroconf/connection_handlers_zeroconf.py rename to gajim/common/zeroconf/connection_handlers_zeroconf.py diff --git a/src/common/zeroconf/connection_zeroconf.py b/gajim/common/zeroconf/connection_zeroconf.py similarity index 100% rename from src/common/zeroconf/connection_zeroconf.py rename to gajim/common/zeroconf/connection_zeroconf.py diff --git a/src/common/zeroconf/roster_zeroconf.py b/gajim/common/zeroconf/roster_zeroconf.py similarity index 100% rename from src/common/zeroconf/roster_zeroconf.py rename to gajim/common/zeroconf/roster_zeroconf.py diff --git a/src/common/zeroconf/zeroconf.py b/gajim/common/zeroconf/zeroconf.py similarity index 100% rename from src/common/zeroconf/zeroconf.py rename to gajim/common/zeroconf/zeroconf.py diff --git a/src/common/zeroconf/zeroconf_avahi.py b/gajim/common/zeroconf/zeroconf_avahi.py similarity index 100% rename from src/common/zeroconf/zeroconf_avahi.py rename to gajim/common/zeroconf/zeroconf_avahi.py diff --git a/src/common/zeroconf/zeroconf_bonjour.py b/gajim/common/zeroconf/zeroconf_bonjour.py similarity index 100% rename from src/common/zeroconf/zeroconf_bonjour.py rename to gajim/common/zeroconf/zeroconf_bonjour.py diff --git a/src/config.py b/gajim/config.py similarity index 100% rename from src/config.py rename to gajim/config.py diff --git a/src/conversation_textview.py b/gajim/conversation_textview.py similarity index 100% rename from src/conversation_textview.py rename to gajim/conversation_textview.py diff --git a/src/dataforms_widget.py b/gajim/dataforms_widget.py similarity index 100% rename from src/dataforms_widget.py rename to gajim/dataforms_widget.py diff --git a/src/dialogs.py b/gajim/dialogs.py similarity index 100% rename from src/dialogs.py rename to gajim/dialogs.py diff --git a/src/disco.py b/gajim/disco.py similarity index 100% rename from src/disco.py rename to gajim/disco.py diff --git a/src/features_window.py b/gajim/features_window.py similarity index 100% rename from src/features_window.py rename to gajim/features_window.py diff --git a/src/filetransfers_window.py b/gajim/filetransfers_window.py similarity index 100% rename from src/filetransfers_window.py rename to gajim/filetransfers_window.py diff --git a/src/gajim-remote.py b/gajim/gajim-remote.py similarity index 100% rename from src/gajim-remote.py rename to gajim/gajim-remote.py diff --git a/src/gajim.py b/gajim/gajim.py similarity index 100% rename from src/gajim.py rename to gajim/gajim.py diff --git a/src/gajim_themes_window.py b/gajim/gajim_themes_window.py similarity index 100% rename from src/gajim_themes_window.py rename to gajim/gajim_themes_window.py diff --git a/src/groupchat_control.py b/gajim/groupchat_control.py similarity index 100% rename from src/groupchat_control.py rename to gajim/groupchat_control.py diff --git a/src/groups.py b/gajim/groups.py similarity index 100% rename from src/groups.py rename to gajim/groups.py diff --git a/src/gtkexcepthook.py b/gajim/gtkexcepthook.py similarity index 100% rename from src/gtkexcepthook.py rename to gajim/gtkexcepthook.py diff --git a/src/gtkgui_helpers.py b/gajim/gtkgui_helpers.py similarity index 100% rename from src/gtkgui_helpers.py rename to gajim/gtkgui_helpers.py diff --git a/src/gtkspell.py b/gajim/gtkspell.py similarity index 100% rename from src/gtkspell.py rename to gajim/gtkspell.py diff --git a/src/gui_interface.py b/gajim/gui_interface.py similarity index 100% rename from src/gui_interface.py rename to gajim/gui_interface.py diff --git a/src/gui_menu_builder.py b/gajim/gui_menu_builder.py similarity index 100% rename from src/gui_menu_builder.py rename to gajim/gui_menu_builder.py diff --git a/src/history_manager.py b/gajim/history_manager.py similarity index 100% rename from src/history_manager.py rename to gajim/history_manager.py diff --git a/src/history_window.py b/gajim/history_window.py similarity index 100% rename from src/history_window.py rename to gajim/history_window.py diff --git a/src/htmltextview.py b/gajim/htmltextview.py similarity index 100% rename from src/htmltextview.py rename to gajim/htmltextview.py diff --git a/src/ipython_view.py b/gajim/ipython_view.py similarity index 100% rename from src/ipython_view.py rename to gajim/ipython_view.py diff --git a/src/logind_listener.py b/gajim/logind_listener.py similarity index 100% rename from src/logind_listener.py rename to gajim/logind_listener.py diff --git a/src/message_control.py b/gajim/message_control.py similarity index 100% rename from src/message_control.py rename to gajim/message_control.py diff --git a/src/message_textview.py b/gajim/message_textview.py similarity index 100% rename from src/message_textview.py rename to gajim/message_textview.py diff --git a/src/message_window.py b/gajim/message_window.py similarity index 100% rename from src/message_window.py rename to gajim/message_window.py diff --git a/src/music_track_listener.py b/gajim/music_track_listener.py similarity index 100% rename from src/music_track_listener.py rename to gajim/music_track_listener.py diff --git a/src/negotiation.py b/gajim/negotiation.py similarity index 100% rename from src/negotiation.py rename to gajim/negotiation.py diff --git a/src/network_watcher.py b/gajim/network_watcher.py similarity index 100% rename from src/network_watcher.py rename to gajim/network_watcher.py diff --git a/src/notify.py b/gajim/notify.py similarity index 100% rename from src/notify.py rename to gajim/notify.py diff --git a/src/plugins/__init__.py b/gajim/plugins/__init__.py similarity index 100% rename from src/plugins/__init__.py rename to gajim/plugins/__init__.py diff --git a/src/plugins/gajimplugin.py b/gajim/plugins/gajimplugin.py similarity index 100% rename from src/plugins/gajimplugin.py rename to gajim/plugins/gajimplugin.py diff --git a/src/plugins/gui.py b/gajim/plugins/gui.py similarity index 100% rename from src/plugins/gui.py rename to gajim/plugins/gui.py diff --git a/src/plugins/helpers.py b/gajim/plugins/helpers.py similarity index 100% rename from src/plugins/helpers.py rename to gajim/plugins/helpers.py diff --git a/src/plugins/pluginmanager.py b/gajim/plugins/pluginmanager.py similarity index 100% rename from src/plugins/pluginmanager.py rename to gajim/plugins/pluginmanager.py diff --git a/src/plugins/plugins_i18n.py b/gajim/plugins/plugins_i18n.py similarity index 100% rename from src/plugins/plugins_i18n.py rename to gajim/plugins/plugins_i18n.py diff --git a/src/profile_window.py b/gajim/profile_window.py similarity index 100% rename from src/profile_window.py rename to gajim/profile_window.py diff --git a/src/pylint.rc b/gajim/pylint.rc similarity index 100% rename from src/pylint.rc rename to gajim/pylint.rc diff --git a/src/remote_control.py b/gajim/remote_control.py similarity index 100% rename from src/remote_control.py rename to gajim/remote_control.py diff --git a/src/roster_window.py b/gajim/roster_window.py similarity index 100% rename from src/roster_window.py rename to gajim/roster_window.py diff --git a/src/search_window.py b/gajim/search_window.py similarity index 100% rename from src/search_window.py rename to gajim/search_window.py diff --git a/src/secrets.py b/gajim/secrets.py similarity index 100% rename from src/secrets.py rename to gajim/secrets.py diff --git a/src/session.py b/gajim/session.py similarity index 100% rename from src/session.py rename to gajim/session.py diff --git a/src/shortcuts_window.py b/gajim/shortcuts_window.py similarity index 100% rename from src/shortcuts_window.py rename to gajim/shortcuts_window.py diff --git a/src/statusicon.py b/gajim/statusicon.py similarity index 100% rename from src/statusicon.py rename to gajim/statusicon.py diff --git a/src/tooltips.py b/gajim/tooltips.py similarity index 100% rename from src/tooltips.py rename to gajim/tooltips.py diff --git a/src/upower_listener.py b/gajim/upower_listener.py similarity index 100% rename from src/upower_listener.py rename to gajim/upower_listener.py diff --git a/src/vcard.py b/gajim/vcard.py similarity index 100% rename from src/vcard.py rename to gajim/vcard.py