--- a/libpurple/plugins/startup.py Thu Sep 01 23:42:21 2016 -0400 +++ b/libpurple/plugins/startup.py Thu Sep 01 23:58:47 2016 -0400 @@ -16,16 +16,18 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA +# You should have received a copy of the GNU General Public License along with +# this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA # from __future__ import absolute_import, division, print_function +import os import sys + import dbus -import os + if len(sys.argv) == 1: print("Usage:", sys.argv[0], "<purple-client> [arguments]") @@ -34,23 +36,24 @@ home = os.path.expanduser('~/.purple/') for arg in range(1, len(sys.argv[1:])): - if sys.argv[arg] == "-c": - home = os.path.expanduser(sys.argv[arg + 1]) - break + if sys.argv[arg] == "-c": + home = os.path.expanduser(sys.argv[arg + 1]) + break bus = dbus.SessionBus() try: - obj = bus.get_object("im.pidgin.purple.PurpleService", "/im/pidgin/purple/PurpleObject") - purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface") - userdir = purple.PurpleUserDir() - if not os.path.isabs(userdir): - userdir = os.path.join(purple.PurpleHomeDir(), userdir) - if home == userdir: - print("Already running.") - purple.PurpleBlistShow() - else: - print("Starting client from a different home directory.") - raise + obj = bus.get_object("im.pidgin.purple.PurpleService", + "/im/pidgin/purple/PurpleObject") + purple = dbus.Interface(obj, "im.pidgin.purple.PurpleInterface") + userdir = purple.PurpleUserDir() + if not os.path.isabs(userdir): + userdir = os.path.join(purple.PurpleHomeDir(), userdir) + if home == userdir: + print("Already running.") + purple.PurpleBlistShow() + else: + print("Starting client from a different home directory.") + raise except: - os.execlp(sys.argv[1], " ".join(sys.argv[2:])) + os.execlp(sys.argv[1], " ".join(sys.argv[2:]))