changeset 1301:37b41ed9ed35

Fixed compiler warnings
author Frank Zschockelt <mcabber_otr[at]freakysoft.de>
date Thu, 30 Aug 2007 02:49:36 +0200
parents 0d4a1699accb
children 1abddbec502a
files mcabber/src/commands.c mcabber/src/otr.c mcabber/src/otr.h mcabber/src/settings.h
diffstat 4 files changed, 55 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/commands.c	Thu Aug 30 00:57:07 2007 +0200
+++ b/mcabber/src/commands.c	Thu Aug 30 02:49:36 2007 +0200
@@ -3053,11 +3053,14 @@
     scr_LogPrint(LPRINT_NORMAL, "default otrpolicy: %s",
                  string_for_otrpolicy(settings_otr_getpolicy(NULL)));
     settings_foreach(SETTINGS_TYPE_OTR, &dump_otrpolicy, NULL);
+    free_arg_lst(paramlst);
     return;
   }
 
   if (!policy) {
-    scr_LogPrint(LPRINT_NORMAL, "Unrecognized or missing parameter!");
+    scr_LogPrint(LPRINT_NORMAL,
+                 "Please call otrpolicy correctly: /otrpolicy (default|jid) "
+                 "(plain|manual|opportunistic|always)");
     free_arg_lst(paramlst);
     return;
   }
@@ -3072,11 +3075,15 @@
     p = always;
   else {
     /* Fail, we don't know _this_ policy*/
+    scr_LogPrint(LPRINT_NORMAL, "mcabber doesn't support _this_ policy!");
+    free_arg_lst(paramlst);
+    return;
   }
 
   if(!strcasecmp(fjid, "default")){
     /*set default policy*/
     settings_otr_setpolicy(NULL, p);
+    free_arg_lst(paramlst);
     return;
   }
   // Allow special jid "" or "." (current buddy)
--- a/mcabber/src/otr.c	Thu Aug 30 00:57:07 2007 +0200
+++ b/mcabber/src/otr.c	Thu Aug 30 02:49:36 2007 +0200
@@ -29,13 +29,14 @@
 #include "jab_priv.h"
 #include "roster.h"
 #include "utils.h"
+#include "screen.h"
+#include "settings.h"
 
 
 static OtrlUserState userstate = NULL;
 static char * account = NULL;
 static char * keyfile = NULL;
 static char * fprfile = NULL;
-static enum otr_policy policy = manual;
 
 
 static OtrlPolicy cb_policy             (void *opdata, ConnContext *ctx);
@@ -83,22 +84,24 @@
 
 static OtrlMessageAppOps ops =
 {
-  policy:                 cb_policy,
-  create_privkey:         cb_create_privkey,
-  is_logged_in:           cb_is_logged_in,
-  inject_message:         cb_inject_message,
-  notify:                 cb_notify,
-  display_otr_message:    cb_display_otr_message,
-  update_context_list:    cb_update_context_list,
-  protocol_name:          cb_protocol_name,
-  protocol_name_free:     cb_protocol_name_free,
-  new_fingerprint:        cb_new_fingerprint,
-  write_fingerprints:     cb_write_fingerprints,
-  gone_secure:            cb_gone_secure,
-  gone_insecure:          cb_gone_insecure,
-  still_secure:           cb_still_secure,
-  log_message:            cb_log_message,
-  max_message_size:       cb_max_message_size
+  cb_policy,
+  cb_create_privkey,
+  cb_is_logged_in,
+  cb_inject_message,
+  cb_notify,
+  cb_display_otr_message,
+  cb_update_context_list,
+  cb_protocol_name,
+  cb_protocol_name_free,
+  cb_new_fingerprint,
+  cb_write_fingerprints,
+  cb_gone_secure,
+  cb_gone_insecure,
+  cb_still_secure,
+  cb_log_message,
+  cb_max_message_size,
+  NULL, /*account_name*/
+  NULL  /*account_name_free*/
 };
 
 static void otr_message_disconnect(ConnContext *ctx);
@@ -107,7 +110,7 @@
 static void otr_handle_smp_tlvs(OtrlTLV * tlvs, ConnContext * ctx);
 
 
-int otr_init(const char *jid)
+void otr_init(const char *jid)
 {
   char * root = expand_filename("~/.mcabber/otr/");
   account = jidtodisp(jid);
@@ -284,7 +287,7 @@
   }
 
   if (sbuf) {
-    scr_WriteIncomingMessage(ctx->username, sbuf, 0, HBB_PREFIX_INFO);
+    scr_WriteIncomingMessage(ctx->username, sbuf, 0, HBB_PREFIX_INFO, 0);
     g_free(sbuf);
   }
 }
@@ -401,9 +404,9 @@
   }
   if (p == OTRL_POLICY_NEVER)
     policy = "plain";
-  else if (p == OTRL_POLICY_OPPORTUNISTIC & ~OTRL_POLICY_ALLOW_V1)
+  else if (p == (OTRL_POLICY_OPPORTUNISTIC & ~OTRL_POLICY_ALLOW_V1))
     policy = "opportunistic";
-  else if (p == OTRL_POLICY_MANUAL & ~OTRL_POLICY_ALLOW_V1)
+  else if (p == (OTRL_POLICY_MANUAL & ~OTRL_POLICY_ALLOW_V1))
     policy = "manual";
   else if (p == (OTRL_POLICY_ALWAYS & ~OTRL_POLICY_ALLOW_V1))
     policy = "always";
@@ -439,11 +442,12 @@
   }
 
   if (ctx) {
-    otrl_message_initiate_smp(userstate, &ops, NULL, ctx, secret,
+    otrl_message_initiate_smp(userstate, &ops, NULL, ctx,
+                              (const unsigned char *)secret,
                               strlen(secret));
     scr_WriteIncomingMessage(ctx->username,
                              "OTR: Socialist Millionaires' Protocol "
-                             "initiated.", 0, HBB_PREFIX_INFO);
+                             "initiated.", 0, HBB_PREFIX_INFO, 0);
   }
 }
 
@@ -464,11 +468,12 @@
                    "Initiation!");
       return;
     }
-    otrl_message_respond_smp(userstate, &ops, NULL, ctx, secret,
+    otrl_message_respond_smp(userstate, &ops, NULL, ctx,
+                             (const unsigned char *)secret,
                              strlen(secret));
     scr_WriteIncomingMessage(ctx->username,
                              "OTR: Socialist Millionaires' Protocol: "
-                             "response sent", 0, HBB_PREFIX_INFO);
+                             "response sent", 0, HBB_PREFIX_INFO, 0);
   }
 }
 
@@ -480,7 +485,7 @@
     otrl_message_abort_smp(userstate, &ops, NULL, ctx);
     scr_WriteIncomingMessage(ctx->username,
                              "OTR: Socialist Millionaires' Protocol aborted.",
-                             0, HBB_PREFIX_INFO);
+                             0, HBB_PREFIX_INFO, 0);
   }
 }
 
@@ -517,6 +522,8 @@
     case always:
       return OTRL_POLICY_ALWAYS & ~OTRL_POLICY_ALLOW_V1;
   }
+
+  return OTRL_POLICY_MANUAL & ~OTRL_POLICY_ALLOW_V1;
 }
 
 /* Create a private key for the given accountname/protocol if
@@ -576,9 +583,10 @@
     case OTRL_NOTIFY_ERROR:   type = "error";   break;
     case OTRL_NOTIFY_WARNING: type = "warning"; break;
     case OTRL_NOTIFY_INFO:    type = "info";    break;
+    default:                  type = "unknown";
   }
   sbuf = g_strdup_printf("OTR %s:%s\n%s\n%s",type,title, primary, secondary);
-  scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO);
+  scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO, 0);
   g_free(sbuf);
 }
 
@@ -592,7 +600,7 @@
                                   const char *protocol, const char *username,
                                   const char *msg)
 {
-  scr_WriteIncomingMessage(username, msg, 0, HBB_PREFIX_INFO);
+  scr_WriteIncomingMessage(username, msg, 0, HBB_PREFIX_INFO, 0);
   return 0;
 }
 
@@ -628,7 +636,7 @@
 
   otrl_privkey_hash_to_human(readable, fingerprint);
   sbuf = g_strdup_printf("OTR: new fingerprint: %s", readable);
-  scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO);
+  scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO, 0);
   g_free(sbuf);
 }
 
@@ -642,14 +650,14 @@
 static void cb_gone_secure(void *opdata, ConnContext *context)
 {
   scr_WriteIncomingMessage(context->username, "OTR: channel established", 0,
-                           HBB_PREFIX_INFO);
+                           HBB_PREFIX_INFO, 0);
 }
 
 /* A ConnContext has left a secure state. */
 static void cb_gone_insecure(void *opdata, ConnContext *context)
 {
   scr_WriteIncomingMessage(context->username, "OTR: channel closed", 0,
-                           HBB_PREFIX_INFO);
+                           HBB_PREFIX_INFO, 0);
 }
 
 /* We have completed an authentication, using the D-H keys we
@@ -657,7 +665,7 @@
 static void cb_still_secure(void *opdata, ConnContext *context, int is_reply)
 {
   scr_WriteIncomingMessage(context->username, "OTR: channel reestablished", 0,
-                           HBB_PREFIX_INFO);
+                           HBB_PREFIX_INFO, 0);
 }
 
 /* Log a message.  The passed message will end in "\n". */
--- a/mcabber/src/otr.h	Thu Aug 30 00:57:07 2007 +0200
+++ b/mcabber/src/otr.h	Thu Aug 30 02:49:36 2007 +0200
@@ -5,6 +5,7 @@
 
 #include <libotr/proto.h>
 #include <libotr/message.h>
+#include <libotr/privkey.h>
 
 enum otr_policy {
   plain,
@@ -13,7 +14,7 @@
   always
 };
 
-int  otr_init(const char *jid);
+void otr_init(const char *jid);
 void otr_terminate(void);
 
 void otr_establish  (const char * buddy);
--- a/mcabber/src/settings.h	Thu Aug 30 00:57:07 2007 +0200
+++ b/mcabber/src/settings.h	Thu Aug 30 02:49:36 2007 +0200
@@ -45,6 +45,11 @@
 void    settings_pgp_setkeyid(const char *bjid, const char *keyid);
 const char *settings_pgp_getkeyid(const char *bjid);
 
+#ifdef HAVE_LIBOTR
+guint   settings_otr_getpolicy(const char *bjid);
+void    settings_otr_setpolicy(const char *bjid, guint value);
+#endif
+
 guint get_max_history_blocks(void);
 
 char *default_muc_nickname(void);