Changeset 9d4352c

Timestamp:

2010-04-20T23:03:01Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

2272cb3

Parents:

e7edbb7

Message:

Restored a few more root commands.

Files:

• dcc.c (modified) (1 diff)
• protocols/ft.h (modified) (1 diff)
• root_commands.c (modified) (9 diffs)

dcc.c

@@ -78 +78 @@
         file->file_name = g_strdup( file_name );
         file->local_id = local_transfer_id++;
-        df->ic = ic;
+        file->ic = df->ic = ic;
         df->ft = file;
         

protocols/ft.h

@@ -107 +107 @@
          */
         gpointer data;
+        struct im_connection *ic;
         
         /*

root_commands.c

@@ -964 +964 @@
 }
 
-#if 0
 static void cmd_qlist( irc_t *irc, char **cmd )
 {
@@ -985 +984 @@
 }
 
+#if 0
 static set_t **cmd_chat_set_findhead( irc_t *irc, char *id )
 {
@@ -1096 +1096 @@
         }
 }
+#endif
 
 static void cmd_transfer( irc_t *irc, char **cmd )
@@ -1145 +1146 @@
                         {
                                 irc_usermsg( irc, "Rejecting file transfer for %s", file->file_name );
-                                imcb_file_canceled( file, "Denied by user" );
+                                imcb_file_canceled( file->ic, file, "Denied by user" );
                         }
                         break;
@@ -1152 +1153 @@
                         {
                                 irc_usermsg( irc, "Canceling file transfer for %s", file->file_name );
-                                imcb_file_canceled( file, "Canceled by user" );
+                                imcb_file_canceled( file->ic, file, "Canceled by user" );
                         }
                         break;
@@ -1158 +1159 @@
         }
 }
-#endif
 
 /* IMPORTANT: Keep this list sorted! The short command logic needs that. */
@@ -1166 +1166 @@
         { "blist",          0, cmd_blist,          0 },
         { "drop",           1, cmd_drop,           0 },
+        { "ft",             0, cmd_transfer,       0 },
         { "help",           0, cmd_help,           0 }, 
         { "identify",       1, cmd_identify,       0 },
         { "info",           1, cmd_info,           0 },
         { "no",             0, cmd_yesno,          0 },
+        { "qlist",          0, cmd_qlist,          0 },
         { "register",       1, cmd_register,       0 },
         { "remove",         1, cmd_remove,         0 },
@@ -1175 +1177 @@
         { "save",           0, cmd_save,           0 },
         { "set",            0, cmd_set,            0 },
+        { "transfer",       0, cmd_transfer,       0 },
         { "yes",            0, cmd_yesno,          0 },
 #if 0
@@ -1180 +1183 @@
         { "block",          1, cmd_block,          0 },
         { "chat",           1, cmd_chat,           0 },
-        { "ft",             0, cmd_transfer,       0 },
-        { "qlist",          0, cmd_qlist,          0 },
-        { "transfer",       0, cmd_transfer,       0 },
 #endif
         { NULL }