Merge branch 'codereview'

ChangeLog

+2012-06-07
+
+	* Release 4.0.0-beta1
+
 2012-05-11
 
 	* otr-plugin.c: Added annoying warnings to prepare for

Makefile.mingw

 WIN32=1
 
 # The version number to put in the plugin info
-PIDGIN_OTR_VERSION = 4.0.0
+PIDGIN_OTR_VERSION = 4.0.0-beta1
 
 # Name of the gettext domain
 GETTEXT_PACKAGE = pidgin-otr

NEWS

+7 Jun 2012:
+
+- The plugin now supports multiple OTR conversations with the same
+  buddy who is logged in at multiple locations. In this case, a new
+  OTR menu will appear, which allows you to select which session an
+  outgoing message is indended for. Note that concurrent SMP
+  authentications with the same buddy who is logged in multiple times
+  is not yet supported (starting a second authentication will end the
+  first).
+- During a private conversation with a buddy, an incoming unencrypted
+  message will now trigger the regular incoming message notifications.
+  In Pidgin this includes showing the message in the top-right
+  notification area, if it is normally configured to do so.
+- New Italian, Swedish, Polish and Vietnamese translations. Updates to
+  the French translation.
+- When a private conversation begins, the plugin will indicate whether
+  Pidgin is configured to log the conversation.
+- By default, OTR conversations will not be logged by Pidgin.
+- Fingerprints in the manual authentication dialog are now selectable
+- The plugin will no longer delete the OTR menus if a non-foreground
+  conversation window is closed.
+- Except on WIN32, the plugin will now set the umask to 0077 before
+  creating the otr.* files in the purple directory so that they end up
+  mode 0600. 
+- The menu item now says "Reauthenticate buddy" when the buddy is
+  already authenticated.
+- Release 4.0.0-beta1
+
 28 May 2008:
 
 - The functionality of the OTR button has now moved to a menu.  There's

README

@@ -302,7 +302,7 @@ The Off-the-Record Messaging plugin for pidgin is covered by the following
     Off-the-Record Messaging plugin for pidgin
     Copyright (C) 2004-2012  Ian Goldberg, Rob Smits,
                              Chris Alexander, Willy Lew,
-			     Lisa Du, Nikita Borisov
+                             Lisa Du, Nikita Borisov
                              <otr@cypherpunks.ca>
 
 

configure.ac

 dnl Process this file with autoconf to produce configure.
 
-AC_INIT(pidgin-otr, 4.0.0)
+AC_INIT(pidgin-otr, 4.0.0-beta1)
 
 AM_CONFIG_HEADER(config.h)
 

dialogs.h

@@ -35,6 +35,8 @@
 #define SESSIONID_HELPURL     BASE_HELPURL "sessionid.php"
 #define UNVERIFIED_HELPURL    BASE_HELPURL "unverified.php"
 #define LEVELS_HELPURL        BASE_HELPURL "levels.php"
+#define SESSIONS_HELPURL      BASE_HELPURL "sessions.php"
+
 
 typedef struct s_OtrgDialogWait *OtrgDialogWaitHandle;
 
@@ -119,7 +121,7 @@ void otrg_dialog_notify_info(const char *accountname, const char *protocol,
 /* Display an OTR control message for the given accountname / protocol /
  * username conversation.  Return 0 on success, non-0 on error (in which
  * case the message will be displayed inline as a received message). */
-int otrg_dialog_display_otr_message( const char *accountname,
+int otrg_dialog_display_otr_message(const char *accountname,
 	const char *protocol, const char *username, const char *msg,
 	int force_create);
 

gtk-ui.c

@@ -165,7 +165,7 @@ static void otrg_gtk_ui_update_keylist(void)
 	PurplePlugin *p;
 	char *proto_name;
 
-	if (context->their_instance != OTRL_INSTAG_MASTER) continue;
+	if (context->m_context != context) continue;
 
 	fingerprint = context->fingerprint_root.next;
 	/* If there's no fingerprint, don't add it to the known
@@ -291,6 +291,7 @@ static void clist_selected(GtkWidget *widget, gint row, gint column,
 		    forget_sensitive = 0;
 		}
 		else if (context_iter->msgstate == OTRL_MSGSTATE_FINISHED) {
+		    disconnect_sensitive = 1;
 		    connect_sensitive = 1;
 		}
 		else if (context_iter->msgstate == OTRL_MSGSTATE_PLAINTEXT) {
@@ -315,6 +316,11 @@ static void clist_unselected(GtkWidget *widget, gint row, gint column,
     clist_all_unselected();
 }
 
+/* For a given fingerprint, find the master context that the fingerprint is
+ * pointing to, iterate through it and all its children.
+ * Of the contexts that are using this fingerprint, return a value that
+ * corresponds to the "best" trust level among these.
+ */
 static int fngsortval(Fingerprint *f)
 {
     int result = 200;
@@ -514,12 +520,8 @@ static void otroptions_clicked_cb(GtkButton *button,
 static void create_otroptions_buttons(struct otroptionsdata *oo,
 	GtkWidget *vbox)
 {
-#ifdef OLD_OTR_BUTTON
-    oo->showotrbutton = gtk_check_button_new_with_label(_("Show OTR button"));
-#else
     oo->showotrbutton = gtk_check_button_new_with_label(
 	    _("Show OTR button in toolbar"));
-#endif
 
     gtk_box_pack_start(GTK_BOX(vbox), oo->showotrbutton, FALSE, FALSE, 0);
 
@@ -621,11 +623,7 @@ static void otrg_gtk_ui_global_options_load(gboolean *showotrbuttonp)
     if (purple_prefs_exists("/OTR/showotrbutton")) {
 	*showotrbuttonp = purple_prefs_get_bool("/OTR/showotrbutton");
     } else {
-#ifdef OLD_OTR_BUTTON
-	*showotrbuttonp = FALSE;
-#else
 	*showotrbuttonp = TRUE;
-#endif
     }
 }
 

otr-plugin.h

@@ -40,11 +40,12 @@ extern PurplePlugin *otrg_plugin_handle;
 
 extern OtrlUserState otrg_plugin_userstate;
 
-/* Given a PurpleConversation, return the selected ConnContext */
+/* Given a PurpleConversation, return the ConnContext corresponding to the
+ * selected instance tag. */
 ConnContext* otrg_plugin_conv_to_selected_context(PurpleConversation *conv,
 	int force_create);
 
-/* Given a PurpleConversation, return the selected instag */
+/* Given a PurpleConversation, return the selected instag. */
 otrl_instag_t otrg_plugin_conv_to_selected_instag(PurpleConversation *conv,
 	otrl_instag_t default_value);
 
@@ -104,10 +105,6 @@ PurpleConversation *otrg_plugin_userinfo_to_conv(const char *accountname,
 PurpleConversation *otrg_plugin_context_to_conv(ConnContext *context,
 	int force_create);
 
-/* Cause the "msg-received" signal to be emitted with the given message
- * payload. This causes the message to pop-up in the notification area when the
- * user has the libnotify plugin enabled. */
-void otrg_emit_msg_received(ConnContext *context, const char* message);
 
 typedef enum {
     TRUST_NOT_PRIVATE,

packaging/windows/pidgin-otr.nsi

@@ -26,7 +26,7 @@
 ; todo: SetBrandingImage
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "pidgin-otr"
-!define PRODUCT_VERSION "4.0.0-0"
+!define PRODUCT_VERSION "4.0.0-0-beta1"
 !define PRODUCT_PUBLISHER "Cypherpunks CA"
 !define PRODUCT_WEB_SITE "http://otr.cypherpunks.ca/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -137,6 +137,7 @@ Section Uninstall
   Delete "$INSTDIR\README.Toolkit.txt"
   Delete "$INSTDIR\README.txt"
   Delete "$INSTDIR\Protocol-v3.html"
+  Delete "$INSTDIR\Protocol-v2.html" ;Left behind by v3.2.0 uninstaller
   Delete "$INSTDIR\COPYING.txt"
   Delete "$INSTDIR\COPYING.LIB.txt"
   Delete "$INSTDIR\otr_mackey.exe"