From 5b662c576dc11f6ef03c62ebd98efd070d93e092 Mon Sep 17 00:00:00 2001 From: Aiwota Programmer Date: Fri, 1 Sep 2006 08:37:47 +0900 Subject: [PATCH] step two, modify script. --- src/FukuiNoNamari/dbus_object.py | 4 ++-- src/fukui-no-namari | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/FukuiNoNamari/dbus_object.py b/src/FukuiNoNamari/dbus_object.py index c0a4533..0125327 100644 --- a/src/FukuiNoNamari/dbus_object.py +++ b/src/FukuiNoNamari/dbus_object.py @@ -22,9 +22,9 @@ if getattr(dbus, 'version', (0,0,0)) >= (0,41,0): import uri_opener -dbus_interface_name = "tk.tetteke.Hage1" +dbus_interface_name = "tk.tetteke.FukuiNoNamari" -class DBusHage1Object(dbus.service.Object): +class DBusFukuiNoNamariObject(dbus.service.Object): def __init__(self, bus_name, object_path): dbus.service.Object.__init__(self, bus_name, object_path) diff --git a/src/fukui-no-namari b/src/fukui-no-namari index 0e325f7..a94640d 100755 --- a/src/fukui-no-namari +++ b/src/fukui-no-namari @@ -27,16 +27,17 @@ import sys import dbus import dbus.service -from Hage1 import thread_window -from Hage1 import board_window -from Hage1 import config -from Hage1 import dbus_object -from Hage1 import uri_opener -from Hage1 import session - -APPNAME = 'Hage1' +APPNAME = 'Fukui-no-Namari' APPVERSION = '0.1' +from FukuiNoNamari import config +config.APPNAME = APPNAME.lower() +from FukuiNoNamari import thread_window +from FukuiNoNamari import board_window +from FukuiNoNamari import dbus_object +from FukuiNoNamari import uri_opener +from FukuiNoNamari import session + # where are these values ? DBUS_NAME_FLAG_ALLOW_REPLACEMENT = 1 DBUS_NAME_FLAG_REPLACE_EXISTING = 2 @@ -46,9 +47,9 @@ DBUS_REQUEST_NAME_REPLY_IN_QUEUE = 2 DBUS_REQUEST_NAME_REPLY_EXISTS = 3 DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER = 4 -dbus_bus_name = "tk.tetteke.Hage1" -dbus_object_path = "/tk/tetteke/Hage1" -dbus_object.dbus_interface_name = "tk.tetteke.Hage1" +dbus_bus_name = "tk.tetteke.FukuiNoNamari" +dbus_object_path = "/tk/tetteke/FukuiNoNamari" +dbus_object.dbus_interface_name = "tk.tetteke.FukuiNoNamari" def usage(): print """usage: hage1 uri""" @@ -86,16 +87,15 @@ if __name__ == "__main__": # the instance does not exist. start normally. bus_name = dbus.service.BusName(dbus_bus_name, bus=session_bus) - obj = dbus_object.DBusHage1Object(bus_name, dbus_object_path) + obj = dbus_object.DBusFukuiNoNamariObject(bus_name, dbus_object_path) gnome.init(APPNAME, APPVERSION) gobject.threads_init() - config.APPNAME = APPNAME # open some windows if uris: - from Hage1.BbsType import bbs_type_judge_uri - from Hage1.BbsType import bbs_type_exception + from FukuiNoNamari.BbsType import bbs_type_judge_uri + from FukuiNoNamari.BbsType import bbs_type_exception for uri in uris: try: uri_opener.open_uri(uri) @@ -112,8 +112,8 @@ if __name__ == "__main__": # open some windows if uris: - from Hage1.BbsType import bbs_type_judge_uri - from Hage1.BbsType import bbs_type_exception + from FukuiNoNamari.BbsType import bbs_type_judge_uri + from FukuiNoNamari.BbsType import bbs_type_exception for uri in uris: try: iface.open_uri(uri) -- 2.11.0