Changeset 2128 for trunk/jons-gtk-gui

Timestamp:

07/11/00 13:48:45 (8 years ago)

Author:

emojon

Message:

Added checking for GTK+ >= 1.2.0 in the configure script

Fixed a *lot* of things

Added in the Secure Channel stuff

Location:

trunk/jons-gtk-gui

Files:

• configure.in (modified) (2 diffs)
• src/about_window.cpp (modified) (2 diffs)
• src/chat_window.cpp (modified) (1 diff)
• src/contact_list.cpp (modified) (2 diffs)
• src/convo.cpp (modified) (6 diffs)
• src/extras.cpp (modified) (2 diffs)
• src/key_request.cpp (added)
• src/licq_gtk.h (modified) (5 diffs)
• src/main.cpp (modified) (1 diff)
• src/main_window.cpp (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/option_window.cpp (modified) (1 diff)
• src/pipe.cpp (modified) (1 diff)
• src/register_user.cpp (modified) (2 diffs)

trunk/jons-gtk-gui/configure.in

@@ -3 +3 @@
 AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(GtkPlugin, 0.10)
+AM_INIT_AUTOMAKE(JonsGtkPlugin, 0.10)
 
 AC_PROG_CC
@@ -17 +17 @@
 AC_LIBTOOL_CXX
 
+dnl Check for libraries
+AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(JonsGtkPlugin 0.10 needs GTK))
+
 dnl Check for header files
 LICQ_CHECK_LICQ

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

@@ -43 +43 @@
     gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
     gtk_window_set_title(GTK_WINDOW(about_window), "About Licq");
-    gtk_widget_set_usize(about_window, 225, 180);
 
     // Window delete event
@@ -62 +61 @@
              "Jon's GTK+ GUI Plugin Version: %s\n"
              "GTK+ Version: %d.%d.%d\nCompiled On: %s\n"
-             "Currently Running On: %s %s [%s]\n\n"
+             "    Currently Running On: %s %s [%s]    \n\n"
              "Author: Jon Keating <jon@licq.org>\n"
              "http://jons-gtk-gui.sourceforge.net\n\n"

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

@@ -68 +68 @@
     gtk_window_set_position(GTK_WINDOW(rc->window), GTK_WIN_POS_CENTER);
     gtk_container_add(GTK_CONTAINER(rc->window), table);
+    gtk_signal_connect(GTK_OBJECT(rc->window), "destroy",
+        GTK_SIGNAL_FUNC(cancel_request_chat), (gpointer)rc);
 
     /*Create the scrolled window with text and attach it to the window */

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

@@ -69 +69 @@
     gtk_clist_freeze(GTK_CLIST(contact_list));
 
-    do_colors();    /* Make the colors */
-    do_pixmaps();   /* Make the pixmap */
+//  do_colors();    /* Make the colors */
+//  do_pixmaps();   /* Make the pixmap */
 
     blah[0] = "";
@@ -337 +337 @@
                  GTK_SIGNAL_FUNC(list_send_url), user);
 
-        /* Only show chat and file requests if the user is not offline */
-        if(user->Status() != ICQ_STATUS_OFFLINE)
-        {
-            add_to_popup("Send Chat Request", _menu,
-                         GTK_SIGNAL_FUNC(list_request_chat), user);
-
-            add_to_popup("Send File Request", _menu,
-                         GTK_SIGNAL_FUNC(list_request_file), user);
-        }
+        add_to_popup("Send Chat Request", _menu,
+                     GTK_SIGNAL_FUNC(list_request_chat), user);
+
+        add_to_popup("Send File Request", _menu,
+                     GTK_SIGNAL_FUNC(list_request_file), user);
+    
+        if(user->Secure())
+            add_to_popup("Close Secure Channel", _menu,
+                GTK_SIGNAL_FUNC(create_key_request_window),
+                user);
+        else    
+            add_to_popup("Request Secure Channel", _menu,
+                GTK_SIGNAL_FUNC(create_key_request_window),
+                user);
 
         /* A separator */

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

@@ -105 +105 @@
 
     /* Set cancel to grayed out at first */
-//  gtk_widget_set_sensitive(c->cancel, FALSE);
+    //gtk_widget_set_sensitive(c->cancel, FALSE);
 
     /* Make the boxes */
@@ -142 +142 @@
                GTK_SIGNAL_FUNC(convo_cancel), c);
     gtk_signal_connect(GTK_OBJECT(c->send), "clicked",
-               GTK_SIGNAL_FUNC(convo_send), c);
+               GTK_SIGNAL_FUNC(convo_send), (gpointer)c);
 
     gtk_box_pack_start(GTK_BOX(button_box), close, TRUE, TRUE, 5);
@@ -227 +227 @@
         if(enter_sends && !(eventkey->state & GDK_SHIFT_MASK))
         {
-            convo_send(NULL, c);
+            convo_send(NULL, (gpointer)c);
         }
         else if(enter_sends)
@@ -242 +242 @@
 }
 
-void convo_send(GtkWidget *widget, struct conversation *c)
-{
+void convo_send(GtkWidget *widget, gpointer _c)
+{
+    struct conversation *c = (struct conversation *)_c;
+
     /* Set the 2 button widgets */
-//  gtk_widget_set_sensitive(c->send, FALSE);
-//  gtk_widget_set_sensitive(c->cancel, TRUE);
+    if(GTK_WIDGET_IS_SENSITIVE(c->send))
+        gtk_widget_set_sensitive(c->send, false);
+    gtk_widget_set_sensitive(c->cancel, true);
 
     gchar *buf;
@@ -315 +318 @@
     g_strreverse(temp);
 
-    if(strncmp(temp, "en", 2) == 0)
+    if(strncmp(temp, " ...", 4) == 0)
         return;
 
     else
     {
-//      gtk_widget_set_sensitive(c->send, TRUE);
-//      gtk_widget_set_sensitive(c->cancel, FALSE);
+        gtk_widget_set_sensitive(c->send, TRUE);
+        gtk_widget_set_sensitive(c->cancel, FALSE);
     }
 }
@@ -328 +331 @@
 {
     /* Set the buttons sensitivity accordingly */
-//  gtk_widget_set_sensitive(c->send, TRUE);
-//  gtk_widget_set_sensitive(c->cancel, FALSE);
+    gtk_widget_set_sensitive(c->send, TRUE);
+    gtk_widget_set_sensitive(c->cancel, FALSE);
 
     /* Actually cancel this event */

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

@@ -215 +215 @@
     }
 
+    else if(event->SubCommand() == ICQ_CMDxSUB_SECURExOPEN ||
+        event->SubCommand() == ICQ_CMDxSUB_SECURExCLOSE)
+    {
+        catcher = g_slist_remove(catcher, etd);
+        finish_secure(event);
+        return;
+    }
+    
     else
     {
@@ -366 +374 @@
 }
 
+void finish_secure(ICQEvent *event)
+{
+    struct key_request *kr = kr_find(event->Uin());
+
+    // Window isn't open.. cya
+    if(kr == NULL)
+        return;
+
+    char result[41];
+    
+    switch(event->Result())
+    {
+        case EVENT_FAILED:
+            strncpy(result,
+                "Remote client does not support OpenSSL.", 41);
+            break;
+
+        case EVENT_ERROR:
+            strncpy(result, "Could not connect to remote client.",
+                41);
+            break;
+
+        case EVENT_SUCCESS:
+            if(kr->open)
+                strncpy(result, "Secure channel established.",
+                    41);
+            else
+                strncpy(result, "Secure channel closed.", 41);
+            break;
+        case EVENT_ACKED:
+        case EVENT_TIMEDOUT:
+        case EVENT_CANCELLED:
+        default:
+            break;
+    }
+
+    gtk_label_set_text(GTK_LABEL(kr->label_status), result);
+}
+
+            
 /*************** Finishing Signals *****************************/
 

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

@@ -354 +354 @@
 };
 
+struct key_request
+{
+    GtkWidget *window;
+    GtkWidget *label_status;
+    gboolean open;
+    ICQUser *user;
+    struct e_tag_data *etag;
+};
+
 struct e_tag_data
 {
@@ -385 +394 @@
 /* Globals in history_window.cpp */
 extern const gchar *line;
+
+/* Globals in key_requst.cpp */
+extern GSList *kr_list;
 
 /* Globals in main.cpp */
@@ -488 +500 @@
 extern struct conversation *convo_find(unsigned long);
 extern void convo_show(struct conversation *);
-extern void convo_send(GtkWidget *, struct conversation *);
+extern void convo_send(GtkWidget *, gpointer);
 extern gboolean key_press_convo(GtkWidget *, GdkEventKey *, gpointer);
 extern void verify_convo_send(GtkWidget *, guint, gchar *,
@@ -511 +523 @@
 extern void finish_away(ICQEvent *);
 extern void finish_random(ICQEvent *);
+extern void finish_secure(ICQEvent *);
 extern void finish_info(CICQSignal *);
 
@@ -540 +553 @@
 
 
+/* Functions in key_request.cpp */
+extern void create_key_request_window(GtkWidget *, ICQUser *);
+extern struct key_request *kr_find(gulong);
+extern struct key_request *kr_new(ICQUser *);
+extern void send_key_request(GtkWidget *, gpointer);
+extern void close_key_request(GtkWidget *, gpointer);
+
+
 /* Functions in log_window.cpp */
 extern void new_log_window();

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

@@ -89 +89 @@
     else
     {
-        main_window = main_window_new(title, 445, 200); 
+        main_window = main_window_new(title, 245, 160); 
         main_window_show();
         contact_list_refresh();

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

@@ -72 +72 @@
     gtk_signal_connect(GTK_OBJECT(main_window), "delete_event",
                GTK_SIGNAL_FUNC(main_window_delete_event), NULL);
+
+    // After the main window has been created, but before the contact
+    // list or anything is shown, we need to make the colors and pixmaps
+    do_colors();
+    do_pixmaps();
 
     /* Add the vertical box in */

trunk/jons-gtk-gui/src/Makefile.am

@@ -21 +21 @@
                 file_window.cpp \
                 history_window.cpp \
+                key_request.cpp \
                 log_window.cpp \
                 main.cpp \

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

@@ -199 +199 @@
     licqConf.FlushFile();
     licqConf.CloseFile();
+
+    // Refresh the colors
+    do_colors();
 }
 

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

@@ -115 +115 @@
       }
 
+      case SIGNAL_LOGOFF:  break;
+
       default:
         g_print("Error: Unknown signal type: %ld.", sig->Signal());

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

@@ -20 +20 @@
 
     /* Create the window */
-    register_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+    register_window = gtk_window_new(GTK_WINDOW_DIALOG);
     gtk_window_set_title(GTK_WINDOW(register_window),
                  "Licq - Registration Wizard");
@@ -135 +135 @@
 
         wizard_message(6);
+
+        main_window = main_window_new(g_strdup_printf("%ld", _uin),
+            445, 200);
+        main_window_show();
+        system_status_refresh();
+        dialog_close(NULL, register_window);
     }