Changeset 2139 for trunk/jons-gtk-gui

Timestamp:

07/13/00 13:10:28 (8 years ago)

Author:

emojon

Message:

Auto secure, works when the user comes from offline to any other status.

Location:

trunk/jons-gtk-gui/src

Files:

• contact_list.cpp (modified) (4 diffs)
• licq_gtk.h (modified) (1 diff)
• more_window.cpp (modified) (4 diffs)

trunk/jons-gtk-gui/src/contact_list.cpp

@@ -27 +27 @@
 #include <gtk/gtk.h>
 #include <sys/time.h>
+#include <list.h>
 
 GdkColor *red, *blue, *online_color, *offline_color, *away_color;
@@ -32 +33 @@
     *invisible, *message_icon, *file_icon, *chat_icon, *url_icon,
     *secure_icon, *birthday_icon, *securebday_icon;
+
+list<unsigned long> AutoSecureList;
 
 GtkWidget *contact_list_new(gint height, gint width)
@@ -228 +231 @@
         } // else
 
+        // See if they are not offline and want to be auto secured
+        if(pUser->AutoSecure())
+        {
+            // Ok, now *can* they be auto secured?
+            if((pUser->SecureChannelSupport() == SECURE_CHANNEL_SUPPORTED) && !pUser->Secure())
+                AutoSecureList.push_back(pUser->Uin());
+                //icq_daemon->icqOpenSecureChannel(_uin);
+        }
+
         if(pUser->Secure() && (pUser->Birthday() == 0))
         {
@@ -259 +271 @@
     }
     FOR_EACH_USER_END
+
+    // Now do the auto secure stuff
+    list<unsigned long>::iterator it;
+    for(it = AutoSecureList.begin(); it != AutoSecureList.end(); it++)
+    {
+        icq_daemon->icqOpenSecureChannel(*it);
+    }
+
+    AutoSecureList.clear();
 
     gtk_clist_set_compare_func(GTK_CLIST(contact_list), NULL);

trunk/jons-gtk-gui/src/licq_gtk.h

@@ -157 +157 @@
     GtkWidget *autochat;
     GtkWidget *autofile;
+    GtkWidget *autosecure;
     GtkWidget *realip;
     GtkWidget *visible;

trunk/jons-gtk-gui/src/more_window.cpp

@@ -71 +71 @@
                      mw->user->OnlineNotify());
 
-    // Auto accept chat and file
+    // Auto accept chat and file and auto secure
     mw->autochat = gtk_check_button_new_with_label("Auto Accept Chat");
     mw->autofile = gtk_check_button_new_with_label("Auto Accept File");
+    mw->autosecure = gtk_check_button_new_with_label("Auto Request Secure");
 
     // Set the state of the auto accept buttons
@@ -80 +81 @@
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mw->autofile),
         mw->user->AutoFileAccept());
+    gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mw->autosecure),
+        mw->user->AutoSecure());
 
     mw->realip = gtk_check_button_new_with_label("Use Real IP (LAN)");
@@ -98 +101 @@
     gtk_box_pack_start(GTK_BOX(general_box), mw->autochat, FALSE, FALSE, 5);
     gtk_box_pack_start(GTK_BOX(general_box), mw->autofile, FALSE, FALSE, 5);
+    gtk_box_pack_start(GTK_BOX(general_box), mw->autosecure, FALSE, FALSE, 5);
     gtk_box_pack_start(GTK_BOX(general_box), mw->realip, FALSE, FALSE, 5);
     gtk_box_pack_start(GTK_BOX(general_box), mw->ignore, FALSE, FALSE, 5);
@@ -281 +285 @@
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mw->autofile)));
 
+    mw->user->SetAutoSecure(
+        gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mw->autosecure)));
     mw->user->SetSendRealIp(
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mw->realip)));