fixing up for test1

git-svn-id: http://svn.irssi.org/repos/irssi-python@4315 dbcabf3a-b0e7-0310-adc4-f8d773084564

34 files changed, 38 insertions, 35 deletions

diff --git a/src/objects/ban-object.c b/src/objects/ban-object.c
index 908bae2..5420315 100644
--- a/src/objects/ban-object.c
+++ b/src/objects/ban-object.c
@@ -85,7 +85,7 @@ static PyMethodDef PyBan_methods[] = {
 PyTypeObject PyBanType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Ban",            /*tp_name*/
+    "irssi.Ban",            /*tp_name*/
     sizeof(PyBan),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyBan_dealloc, /*tp_dealloc*/
diff --git a/src/objects/base-objects.c b/src/objects/base-objects.c
index 42f5cac..84d15d7 100644
--- a/src/objects/base-objects.c
+++ b/src/objects/base-objects.c
@@ -74,7 +74,7 @@ static PyMethodDef PyIrssiBase_methods[] = {
 PyTypeObject PyIrssiBaseType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "IrssiBase",            /*tp_name*/
+    "irssi.IrssiBase",            /*tp_name*/
     sizeof(PyIrssiBase),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyIrssiBase_dealloc, /*tp_dealloc*/
@@ -178,7 +178,7 @@ static PyMethodDef PyIrssiChatBase_methods[] = {
 PyTypeObject PyIrssiChatBaseType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "IrssiChatBase",            /*tp_name*/
+    "irssi.IrssiChatBase",            /*tp_name*/
     sizeof(PyIrssiChatBase),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyIrssiChatBase_dealloc, /*tp_dealloc*/
diff --git a/src/objects/channel-object.c b/src/objects/channel-object.c
index fa4edd4..63f7f35 100644
--- a/src/objects/channel-object.c
+++ b/src/objects/channel-object.c
@@ -303,7 +303,7 @@ static PyMethodDef PyChannel_methods[] = {
 PyTypeObject PyChannelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Channel",            /*tp_name*/
+    "irssi.Channel",            /*tp_name*/
     sizeof(PyChannel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyChannel_dealloc, /*tp_dealloc*/
diff --git a/src/objects/chatnet-object.c b/src/objects/chatnet-object.c
index c22f0cb..2cbbb70 100644
--- a/src/objects/chatnet-object.c
+++ b/src/objects/chatnet-object.c
@@ -105,7 +105,7 @@ static PyMethodDef PyChatnet_methods[] = {
 PyTypeObject PyChatnetType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Chatnet",            /*tp_name*/
+    "irssi.Chatnet",            /*tp_name*/
     sizeof(PyChatnet),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyChatnet_dealloc, /*tp_dealloc*/
diff --git a/src/objects/command-object.c b/src/objects/command-object.c
index ad60012..0d4c3b1 100644
--- a/src/objects/command-object.c
+++ b/src/objects/command-object.c
@@ -75,7 +75,7 @@ static PyMethodDef PyCommand_methods[] = {
 PyTypeObject PyCommandType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Command",            /*tp_name*/
+    "irssi.Command",            /*tp_name*/
     sizeof(PyCommand),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyCommand_dealloc, /*tp_dealloc*/
diff --git a/src/objects/connect-object.c b/src/objects/connect-object.c
index 8ef9a29..dceaa23 100644
--- a/src/objects/connect-object.c
+++ b/src/objects/connect-object.c
@@ -114,7 +114,7 @@ static PyGetSetDef PyConnect_getseters[] = {
 PyTypeObject PyConnectType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Connect",            /*tp_name*/
+    "irssi.Connect",            /*tp_name*/
     sizeof(PyConnect),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyConnect_dealloc, /*tp_dealloc*/
diff --git a/src/objects/dcc-chat-object.c b/src/objects/dcc-chat-object.c
index 5cfe796..0a6e0d0 100644
--- a/src/objects/dcc-chat-object.c
+++ b/src/objects/dcc-chat-object.c
@@ -78,7 +78,7 @@ static PyMethodDef PyDccChat_methods[] = {
 PyTypeObject PyDccChatType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "DccChat",            /*tp_name*/
+    "irssi.DccChat",            /*tp_name*/
     sizeof(PyDccChat),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     0,                  /*tp_dealloc*/
diff --git a/src/objects/dcc-get-object.c b/src/objects/dcc-get-object.c
index fa7c13a..959af05 100644
--- a/src/objects/dcc-get-object.c
+++ b/src/objects/dcc-get-object.c
@@ -79,7 +79,7 @@ static PyMethodDef PyDccGet_methods[] = {
 PyTypeObject PyDccGetType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "DccGet",            /*tp_name*/
+    "irssi.DccGet",            /*tp_name*/
     sizeof(PyDccGet),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     0,                  /*tp_dealloc*/
diff --git a/src/objects/dcc-object.c b/src/objects/dcc-object.c
index 95a3a4a..4499d7b 100644
--- a/src/objects/dcc-object.c
+++ b/src/objects/dcc-object.c
@@ -250,7 +250,7 @@ static PyMethodDef PyDcc_methods[] = {
 PyTypeObject PyDccType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Dcc",            /*tp_name*/
+    "irssi.Dcc",            /*tp_name*/
     sizeof(PyDcc),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyDcc_dealloc, /*tp_dealloc*/
diff --git a/src/objects/dcc-send-object.c b/src/objects/dcc-send-object.c
index 643f741..528b0a9 100644
--- a/src/objects/dcc-send-object.c
+++ b/src/objects/dcc-send-object.c
@@ -79,7 +79,7 @@ static PyMethodDef PyDccSend_methods[] = {
 PyTypeObject PyDccSendType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "DccSend",            /*tp_name*/
+    "irssi.DccSend",            /*tp_name*/
     sizeof(PyDccSend),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     0,                  /*tp_dealloc*/
diff --git a/src/objects/ignore-object.c b/src/objects/ignore-object.c
index 979c9b1..89e5128 100644
--- a/src/objects/ignore-object.c
+++ b/src/objects/ignore-object.c
@@ -214,7 +214,7 @@ static PyMethodDef PyIgnore_methods[] = {
 PyTypeObject PyIgnoreType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Ignore",            /*tp_name*/
+    "irssi.Ignore",            /*tp_name*/
     sizeof(PyIgnore),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyIgnore_dealloc, /*tp_dealloc*/
diff --git a/src/objects/irc-channel-object.c b/src/objects/irc-channel-object.c
index 5e9531d..63e4956 100644
--- a/src/objects/irc-channel-object.c
+++ b/src/objects/irc-channel-object.c
@@ -112,7 +112,7 @@ static PyMethodDef PyIrcChannel_methods[] = {
 PyTypeObject PyIrcChannelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "IrcChannel",            /*tp_name*/
+    "irssi.IrcChannel",            /*tp_name*/
     sizeof(PyIrcChannel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     0,                          /*tp_dealloc*/
diff --git a/src/objects/irc-connect-object.c b/src/objects/irc-connect-object.c
index 5068dea..9edc5ae 100644
--- a/src/objects/irc-connect-object.c
+++ b/src/objects/irc-connect-object.c
@@ -28,7 +28,7 @@ static PyGetSetDef PyIrcConnect_getseters[] = {
 PyTypeObject PyIrcConnectType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "IrcConnect",            /*tp_name*/
+    "irssi.IrcConnect",            /*tp_name*/
     sizeof(PyIrcConnect),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     0,                          /*tp_dealloc*/
diff --git a/src/objects/irc-server-object.c b/src/objects/irc-server-object.c
index 4e9a28e..7ad9383 100644
--- a/src/objects/irc-server-object.c
+++ b/src/objects/irc-server-object.c
@@ -433,7 +433,7 @@ static PyMethodDef PyIrcServer_methods[] = {
 PyTypeObject PyIrcServerType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "IrcServer",            /*tp_name*/
+    "irssi.IrcServer",            /*tp_name*/
     sizeof(PyIrcServer),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     0,                         /*tp_dealloc*/
diff --git a/src/objects/log-object.c b/src/objects/log-object.c
index b18f826..537c8c1 100644
--- a/src/objects/log-object.c
+++ b/src/objects/log-object.c
@@ -407,7 +407,7 @@ static PyMethodDef PyLog_methods[] = {
 PyTypeObject PyLogType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Log",            /*tp_name*/
+    "irssi.Log",            /*tp_name*/
     sizeof(PyLog),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyLog_dealloc, /*tp_dealloc*/
diff --git a/src/objects/logitem-object.c b/src/objects/logitem-object.c
index 4dc2275..7e1b24b 100644
--- a/src/objects/logitem-object.c
+++ b/src/objects/logitem-object.c
@@ -70,7 +70,7 @@ static PyMethodDef PyLogitem_methods[] = {
 PyTypeObject PyLogitemType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Logitem",            /*tp_name*/
+    "irssi.Logitem",            /*tp_name*/
     sizeof(PyLogitem),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyLogitem_dealloc, /*tp_dealloc*/
diff --git a/src/objects/main-window-object.c b/src/objects/main-window-object.c
index 6541f2b..d091fd0 100644
--- a/src/objects/main-window-object.c
+++ b/src/objects/main-window-object.c
@@ -120,7 +120,7 @@ static PyMethodDef PyMainWindow_methods[] = {
 PyTypeObject PyMainWindowType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "MainWindow",            /*tp_name*/
+    "irssi.MainWindow",            /*tp_name*/
     sizeof(PyMainWindow),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyMainWindow_dealloc, /*tp_dealloc*/
diff --git a/src/objects/netsplit-channel-object.c b/src/objects/netsplit-channel-object.c
index 3e2639b..4947127 100644
--- a/src/objects/netsplit-channel-object.c
+++ b/src/objects/netsplit-channel-object.c
@@ -90,7 +90,7 @@ static PyMethodDef PyNetsplitChannel_methods[] = {
 PyTypeObject PyNetsplitChannelType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "NetsplitChannel",            /*tp_name*/
+    "irssi.NetsplitChannel",            /*tp_name*/
     sizeof(PyNetsplitChannel),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyNetsplitChannel_dealloc, /*tp_dealloc*/
diff --git a/src/objects/netsplit-object.c b/src/objects/netsplit-object.c
index d64bd97..d9cc64d 100644
--- a/src/objects/netsplit-object.c
+++ b/src/objects/netsplit-object.c
@@ -112,7 +112,7 @@ static PyMethodDef PyNetsplit_methods[] = {
 PyTypeObject PyNetsplitType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Netsplit",            /*tp_name*/
+    "irssi.Netsplit",            /*tp_name*/
     sizeof(PyNetsplit),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyNetsplit_dealloc, /*tp_dealloc*/
diff --git a/src/objects/netsplit-server-object.c b/src/objects/netsplit-server-object.c
index 7208ae1..8b46197 100644
--- a/src/objects/netsplit-server-object.c
+++ b/src/objects/netsplit-server-object.c
@@ -87,7 +87,7 @@ static PyMethodDef PyNetsplitServer_methods[] = {
 PyTypeObject PyNetsplitServerType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "NetsplitServer",            /*tp_name*/
+    "irssi.NetsplitServer",            /*tp_name*/
     sizeof(PyNetsplitServer),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyNetsplitServer_dealloc, /*tp_dealloc*/
diff --git a/src/objects/nick-object.c b/src/objects/nick-object.c
index 79f3a85..af5feab 100644
--- a/src/objects/nick-object.c
+++ b/src/objects/nick-object.c
@@ -160,7 +160,7 @@ static PyMethodDef PyNick_methods[] = {
 PyTypeObject PyNickType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Nick",            /*tp_name*/
+    "irssi.Nick",            /*tp_name*/
     sizeof(PyNick),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyNick_dealloc, /*tp_dealloc*/
diff --git a/src/objects/notifylist-object.c b/src/objects/notifylist-object.c
index 3366d0f..f6deb2d 100644
--- a/src/objects/notifylist-object.c
+++ b/src/objects/notifylist-object.c
@@ -151,7 +151,7 @@ static PyMethodDef PyNotifylist_methods[] = {
 PyTypeObject PyNotifylistType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Notifylist",            /*tp_name*/
+    "irssi.Notifylist",            /*tp_name*/
     sizeof(PyNotifylist),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyNotifylist_dealloc, /*tp_dealloc*/
diff --git a/src/objects/process-object.c b/src/objects/process-object.c
index 43c0fd7..08f423d 100644
--- a/src/objects/process-object.c
+++ b/src/objects/process-object.c
@@ -152,7 +152,7 @@ static PyMethodDef PyProcess_methods[] = {
 PyTypeObject PyProcessType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Process",            /*tp_name*/
+    "irssi.Process",            /*tp_name*/
     sizeof(PyProcess),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyProcess_dealloc, /*tp_dealloc*/
diff --git a/src/objects/pyscript-object.c b/src/objects/pyscript-object.c
index ae4770e..f51b696 100644
--- a/src/objects/pyscript-object.c
+++ b/src/objects/pyscript-object.c
@@ -614,7 +614,7 @@ static PyMemberDef PyScript_members[] = {
 PyTypeObject PyScriptType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Script",               /*tp_name*/
+    "irssi.Script",               /*tp_name*/
     sizeof(PyScript),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyScript_dealloc, /*tp_dealloc*/
diff --git a/src/objects/query-object.c b/src/objects/query-object.c
index 47badd5..b470e58 100644
--- a/src/objects/query-object.c
+++ b/src/objects/query-object.c
@@ -101,7 +101,7 @@ static PyMethodDef PyQuery_methods[] = {
 PyTypeObject PyQueryType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Query",            /*tp_name*/
+    "irssi.Query",            /*tp_name*/
     sizeof(PyQuery),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyQuery_dealloc,    /*tp_dealloc*/
diff --git a/src/objects/rawlog-object.c b/src/objects/rawlog-object.c
index 340d60a..39915e6 100644
--- a/src/objects/rawlog-object.c
+++ b/src/objects/rawlog-object.c
@@ -255,7 +255,7 @@ static PyMethodDef PyRawlog_methods[] = {
 PyTypeObject PyRawlogType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Rawlog",            /*tp_name*/
+    "irssi.Rawlog",            /*tp_name*/
     sizeof(PyRawlog),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyRawlog_dealloc, /*tp_dealloc*/
diff --git a/src/objects/reconnect-object.c b/src/objects/reconnect-object.c
index 6483242..29e2e46 100644
--- a/src/objects/reconnect-object.c
+++ b/src/objects/reconnect-object.c
@@ -75,7 +75,7 @@ static PyMethodDef PyReconnect_methods[] = {
 PyTypeObject PyReconnectType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Reconnect",            /*tp_name*/
+    "irssi.Reconnect",            /*tp_name*/
     sizeof(PyReconnect),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyReconnect_dealloc, /*tp_dealloc*/
diff --git a/src/objects/server-object.c b/src/objects/server-object.c
index 31415b8..0276739 100644
--- a/src/objects/server-object.c
+++ b/src/objects/server-object.c
@@ -708,7 +708,7 @@ static PyMethodDef PyServer_methods[] = {
 PyTypeObject PyServerType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Server",            /*tp_name*/
+    "irssi.Server",            /*tp_name*/
     sizeof(PyServer),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyServer_dealloc, /*tp_dealloc*/
diff --git a/src/objects/statusbar-item-object.c b/src/objects/statusbar-item-object.c
index f6768af..4d80e26 100644
--- a/src/objects/statusbar-item-object.c
+++ b/src/objects/statusbar-item-object.c
@@ -171,7 +171,7 @@ static PyMethodDef PyStatusbarItem_methods[] = {
 PyTypeObject PyStatusbarItemType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "StatusbarItem",            /*tp_name*/
+    "irssi.StatusbarItem",            /*tp_name*/
     sizeof(PyStatusbarItem),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyStatusbarItem_dealloc, /*tp_dealloc*/
diff --git a/src/objects/textdest-object.c b/src/objects/textdest-object.c
index 2ad6523..e645abb 100644
--- a/src/objects/textdest-object.c
+++ b/src/objects/textdest-object.c
@@ -187,7 +187,7 @@ static PyMethodDef PyTextDest_methods[] = {
 PyTypeObject PyTextDestType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "TextDest",            /*tp_name*/
+    "irssi.TextDest",            /*tp_name*/
     sizeof(PyTextDest),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyTextDest_dealloc, /*tp_dealloc*/
diff --git a/src/objects/theme-object.c b/src/objects/theme-object.c
index 0f12217..d3937ee 100644
--- a/src/objects/theme-object.c
+++ b/src/objects/theme-object.c
@@ -126,7 +126,7 @@ static PyMethodDef PyTheme_methods[] = {
 PyTypeObject PyThemeType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Theme",            /*tp_name*/
+    "irssi.Theme",            /*tp_name*/
     sizeof(PyTheme),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyTheme_dealloc, /*tp_dealloc*/
diff --git a/src/objects/window-item-object.c b/src/objects/window-item-object.c
index 2f18f7d..45ed733 100644
--- a/src/objects/window-item-object.c
+++ b/src/objects/window-item-object.c
@@ -251,7 +251,7 @@ static PyMethodDef PyWindowItem_methods[] = {
 PyTypeObject PyWindowItemType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "WindowItem",            /*tp_name*/
+    "irssi.WindowItem",            /*tp_name*/
     sizeof(PyWindowItem),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     0,                      /*tp_dealloc*/
diff --git a/src/objects/window-object.c b/src/objects/window-object.c
index d5aa475..b17a5d7 100644
--- a/src/objects/window-object.c
+++ b/src/objects/window-object.c
@@ -608,7 +608,7 @@ static PyMethodDef PyWindow_methods[] = {
 PyTypeObject PyWindowType = {
     PyObject_HEAD_INIT(NULL)
     0,                         /*ob_size*/
-    "Window",            /*tp_name*/
+    "irssi.Window",            /*tp_name*/
     sizeof(PyWindow),             /*tp_basicsize*/
     0,                         /*tp_itemsize*/
     (destructor)PyWindow_dealloc, /*tp_dealloc*/
diff --git a/src/pyloader.c b/src/pyloader.c
index 9c878a4..2ce1bef 100644
--- a/src/pyloader.c
+++ b/src/pyloader.c
@@ -232,8 +232,11 @@ PyObject *pyloader_find_script_obj(void)
 
     for (frame = PyEval_GetFrame(); frame != NULL; frame = frame->f_back)
     {
+        PyObject *script;
+
         g_return_val_if_fail(frame->f_globals != NULL, NULL);
-        PyObject *script = PyDict_GetItemString(frame->f_globals, "_script");
+        script = PyDict_GetItemString(frame->f_globals, "_script");
+
         if (script && pyscript_check(script))
         {
             /*