Changeset 2453 for trunk/jons-gtk-gui

Timestamp:

01/25/01 06:07:26 (8 years ago)

Author:

emojon

Message:

Damn, did a double freeze in the convo recv, blocked all future text from entering the window

Location:

trunk/jons-gtk-gui/src

Files:

• convo.cpp (modified) (5 diffs)
• history_window.cpp (modified) (1 diff)
• user_menu.cpp (modified) (1 diff)

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

@@ -487 +487 @@
       case ICQ_CMDxSUB_URL:
       { 
-        const char *url = u_event->Text();
-
         const gchar *for_user_u =
            g_strdup_printf("\n%s has sent you a URL!\n%s\n",
-                    c->user->GetAlias(), url);
-
-        gtk_text_freeze(GTK_TEXT(c->text));
+                    c->user->GetAlias(),
+                    u_event->Text());
+
         gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, for_user_u, -1);
         gtk_text_thaw(GTK_TEXT(c->text));
+        g_free(for_user_u);
         break;
       }
@@ -505 +504 @@
         if(u_event->IsCancelled())
         {
-            gtk_text_freeze(GTK_TEXT(c->text));
             gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, chat_d, -1);
             gtk_text_thaw(GTK_TEXT(c->text));
@@ -515 +513 @@
                 g_strdup_printf("\n%s requests to chat with you!\n%s\n",
                 c->user->GetAlias(), chat_d);
-            gtk_text_freeze(GTK_TEXT(c->text));
             gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, for_user_c,
                 -1);
@@ -532 +529 @@
         if(u_event->IsCancelled())
         {
-            gtk_text_freeze(GTK_TEXT(c->text));
             gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, file_d, -1);
             gtk_text_thaw(GTK_TEXT(c->text));
@@ -543 +539 @@
                     c->user->GetAlias(), file_d);
 
-            gtk_text_freeze(GTK_TEXT(c->text));
             gtk_text_insert(GTK_TEXT(c->text), 0, 0, 0, for_user_f, -1);
             gtk_text_thaw(GTK_TEXT(c->text));

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

@@ -124 +124 @@
         tmStupid = localtime(&_time);
         strftime(szDate, 29, "%c", tmStupid);
-        szDesc = event_description(*history_iter);
+        strcpy(szDesc, event_description(*history_iter));
         
         if ((*history_iter)->Direction() == D_RECEIVER)

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

@@ -39 +39 @@
         if(user->NewMessages() > 0)
             c = convo_new(user, TRUE);
-
         else
-
             c = convo_new(user, FALSE);
     }