Changeset 2532 for trunk/jons-gtk-gui

Timestamp:

05/20/01 08:22:36 (8 years ago)

Author:

emojon

Message:

Changed all every instance of NULL to 0.
Due to some compilers not liking it.

Fixed bug with a crash when viewing history.

Location:

trunk/jons-gtk-gui/src

Files:

• about_window.cpp (modified) (4 diffs)
• add_user_window.cpp (modified) (1 diff)
• auth_user_window.cpp (modified) (1 diff)
• away_window.cpp (modified) (8 diffs)
• chat_window.cpp (modified) (24 diffs)
• contact_list.cpp (modified) (7 diffs)
• convo.cpp (modified) (9 diffs)
• extras.cpp (modified) (14 diffs)
• file_window.cpp (modified) (13 diffs)
• history_window.cpp (modified) (4 diffs)
• key_request.cpp (modified) (2 diffs)
• log_window.cpp (modified) (5 diffs)
• main.cpp (modified) (1 diff)
• main_window.cpp (modified) (4 diffs)
• Makefile.am (modified) (1 diff)
• menu.cpp (modified) (5 diffs)
• more_window.cpp (modified) (4 diffs)
• option_window.cpp (modified) (2 diffs)
• pipe.cpp (modified) (2 diffs)
• plugin_window.cpp (modified) (4 diffs)
• random_chat.cpp (modified) (5 diffs)
• register_user.cpp (modified) (4 diffs)
• search_user_window.cpp (modified) (8 diffs)
• security_window.cpp (modified) (13 diffs)
• stats_window.cpp (modified) (2 diffs)
• status.cpp (modified) (2 diffs)
• system_message.cpp (modified) (3 diffs)
• user_info_window.cpp (modified) (10 diffs)
• user_menu.cpp (modified) (2 diffs)

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

@@ -33 +33 @@
 {
     // Only one about window
-    if(about_window != NULL)
+    if(about_window != 0)
     {
         gdk_window_raise(about_window->window);
@@ -46 +46 @@
     // Window delete event
     gtk_signal_connect(GTK_OBJECT(about_window), "destroy",
-        GTK_SIGNAL_FUNC(close_about_window), NULL);
+        GTK_SIGNAL_FUNC(close_about_window), 0);
 
     // A vertical box for the label and ok button
@@ -79 +79 @@
     GtkWidget *ok = gtk_button_new_with_label("OK");
     gtk_signal_connect(GTK_OBJECT(ok), "clicked",
-        GTK_SIGNAL_FUNC(close_about_window), NULL);
+        GTK_SIGNAL_FUNC(close_about_window), 0);
     gtk_box_pack_start(GTK_BOX(v_box), ok, true, true, 0);
 
@@ -88 +88 @@
 {
     gtk_widget_destroy(about_window);
-    about_window = NULL;
+    about_window = 0;
 }

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

@@ -52 +52 @@
     /* Accept only numbers in the a->entry */
     gtk_signal_connect(GTK_OBJECT(a->entry), "insert-text",
-               GTK_SIGNAL_FUNC(verify_numbers), NULL);
+               GTK_SIGNAL_FUNC(verify_numbers), 0);
     
     /* Add the first hbox to the top of the vbox */

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

@@ -52 +52 @@
     /* Accept only numbers in au->entry */
     gtk_signal_connect(GTK_OBJECT(au->entry), "insert-text",
-               GTK_SIGNAL_FUNC(verify_numbers), NULL);
+               GTK_SIGNAL_FUNC(verify_numbers), 0);
 
     /* Make the scrolled text box */
-    au->text = gtk_text_new(NULL, NULL);
+    au->text = gtk_text_new(0, 0);
     gtk_text_set_editable(GTK_TEXT(au->text), TRUE);
     gtk_text_set_word_wrap(GTK_TEXT(au->text), TRUE);
     gtk_text_set_line_wrap(GTK_TEXT(au->text), TRUE);
 
-    scroll = gtk_scrolled_window_new(NULL, NULL);
+    scroll = gtk_scrolled_window_new(0, 0);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
                        GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);

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

@@ -44 +44 @@
 
     /* The text box */
-    away_d->text = gtk_text_new(NULL, NULL);
+    away_d->text = gtk_text_new(0, 0);
     gtk_text_set_editable(GTK_TEXT(away_d->text), TRUE);
     gtk_widget_set_usize(GTK_WIDGET(away_d->text), 300, 100);
@@ -99 +99 @@
     struct user_away_window *uaw = uaw_find(user->Uin());
     
-    if(uaw != NULL)
+    if(uaw != 0)
         return;
 
@@ -129 +129 @@
 
     /* The scrolling window */
-    scroll = gtk_scrolled_window_new(NULL, NULL);
+    scroll = gtk_scrolled_window_new(0, 0);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
                        GTK_POLICY_NEVER,
@@ -135 +135 @@
 
     /* The text box */
-    uaw->text_box = gtk_text_new(NULL, NULL);
+    uaw->text_box = gtk_text_new(0, 0);
     gtk_widget_set_usize(uaw->text_box, 235, 60);
     gtk_text_set_editable(GTK_TEXT(uaw->text_box), FALSE);
@@ -195 +195 @@
     uaw_list = g_slist_remove(uaw_list, uaw);
     catcher = g_slist_remove(catcher, uaw->etag);
-    dialog_close(NULL, uaw->window);
+    dialog_close(0, uaw->window);
 }
 
@@ -210 +210 @@
 
     /* If it does, return it, if not, make one */
-    if(uaw != NULL) 
+    if(uaw != 0) 
         return uaw;
 
@@ -219 +219 @@
     uaw_list = g_slist_append(uaw_list, uaw);
 
-//  list_read_message(NULL, uaw->user);
+//  list_read_message(0, uaw->user);
 
     return uaw;
@@ -239 +239 @@
 
     /* It wasn't found, return null */
-    return NULL;
-}
+    return 0;
+}

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

@@ -37 +37 @@
 
     // No get outta here, bitch!
-    if(rc != NULL)
+    if(rc != 0)
         return;
 
@@ -71 +71 @@
 
     /*Create the scrolled window with text and attach it to the window */
-    scroll = gtk_scrolled_window_new(NULL, NULL);
+    scroll = gtk_scrolled_window_new(0, 0);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
                        GTK_POLICY_NEVER,
                        GTK_POLICY_AUTOMATIC);
-    rc->text_box = gtk_text_new(NULL, NULL);
+    rc->text_box = gtk_text_new(0, 0);
     gtk_text_set_editable(GTK_TEXT(rc->text_box), TRUE);
     gtk_text_set_word_wrap(GTK_TEXT(rc->text_box), TRUE);
@@ -87 +87 @@
 
     /* The send as buttons */
-    rc->send_norm = gtk_radio_button_new_with_label(NULL, "Send Normal");
+    rc->send_norm = gtk_radio_button_new_with_label(0, "Send Normal");
     rc->send_urg = gtk_radio_button_new_with_label_from_widget(
             GTK_RADIO_BUTTON(rc->send_norm), "Send Urgent");
@@ -163 +163 @@
 
     /* Don't make it if it's already there, return it */
-    if(rc != NULL)
+    if(rc != 0)
         return rc;
 
@@ -188 +188 @@
 
     /* It wasn't found, return null */
-    return NULL;
+    return 0;
 }
 
@@ -200 +200 @@
 
     // Make a GList with the current chats in it
-    GList *items = NULL;
+    GList *items = 0;
 
     ChatDlgList::iterator iter;
@@ -207 +207 @@
 
     // Make sure there are chats to show
-    if(items == NULL)
+    if(items == 0)
         return;
         
@@ -327 +327 @@
     if(auto_accept)
     {
-        chat_accept(NULL, (gpointer)r_cr);
+        chat_accept(0, (gpointer)r_cr);
         return;
     }
@@ -422 +422 @@
     CExtendedAck *ea = event->ExtendedAck();
     
-    if(ea == NULL)
+    if(ea == 0)
     {
         gLog.Error("%sInternal error: chat_start_as_client(): chat request acknowledgement without extended result.\n", L_ERRORxSTR);
@@ -515 +515 @@
     /* Create the remote frame with the remote scrolled text window */
     cw->frame_remote = gtk_frame_new("Remote");
-    cw->text_remote = gtk_text_new(NULL, NULL);
+    cw->text_remote = gtk_text_new(0, 0);
     gtk_text_set_editable(GTK_TEXT(cw->text_remote), FALSE);
     gtk_text_set_word_wrap(GTK_TEXT(cw->text_remote), TRUE);
     gtk_text_set_line_wrap(GTK_TEXT(cw->text_remote), TRUE);
-    scroll1 = gtk_scrolled_window_new(NULL,
+    scroll1 = gtk_scrolled_window_new(0,
                       GTK_TEXT(cw->text_remote)->vadj);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll1),
@@ -540 +540 @@
     gUserManager.DropUser(o);
 
-    cw->text_local = gtk_text_new(NULL, NULL);
+    cw->text_local = gtk_text_new(0, 0);
     gtk_text_set_editable(GTK_TEXT(cw->text_local), TRUE);
     gtk_text_set_word_wrap(GTK_TEXT(cw->text_local), TRUE);
     gtk_text_set_line_wrap(GTK_TEXT(cw->text_local), TRUE);
-    scroll2 = gtk_scrolled_window_new(NULL,
+    scroll2 = gtk_scrolled_window_new(0,
                       GTK_TEXT(cw->text_local)->vadj);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll2),
@@ -563 +563 @@
 
     /* Create the main text box in a scrolled window */
-    cw->text_irc = gtk_text_new(NULL, NULL);
+    cw->text_irc = gtk_text_new(0, 0);
     gtk_text_set_editable(GTK_TEXT(cw->text_irc), FALSE);
     gtk_text_set_word_wrap(GTK_TEXT(cw->text_irc), TRUE);
     gtk_text_set_line_wrap(GTK_TEXT(cw->text_irc), TRUE);
-    scroll1 = gtk_scrolled_window_new(NULL,
+    scroll1 = gtk_scrolled_window_new(0,
                       GTK_TEXT(cw->text_irc)->vadj);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll1),
@@ -616 +616 @@
     GtkItemFactoryEntry menu_items[] =
     {
-            { "/_Chat",        NULL,         NULL, 0, "<Branch>" },
+            { "/_Chat",        0,         0, 0, "<Branch>" },
             { "/Chat/_Audio", "<control>A",
           GtkItemFactoryCallback(chat_audio), 0, "<ToggleItem>" },
 //      { "/Chat/_Kick", "<control>K",
-//        GtkItemFactoryCallback(chat_kick), 0, NULL},
+//        GtkItemFactoryCallback(chat_kick), 0, 0},
 //      { "/Chat/Kick _No Vote", "<control>N",
-//        GtkItemFactoryCallback(chat_kick_no_vote), 0, NULL},
+//        GtkItemFactoryCallback(chat_kick_no_vote), 0, 0},
         { "/Chat/_Save", "<control>S",
-          GtkItemFactoryCallback(chat_save), 0, NULL},
-            { "/Chat/sep1",    NULL,     NULL, 0, "<Separator>" },
+          GtkItemFactoryCallback(chat_save), 0, 0},
+            { "/Chat/sep1",    0,    0, 0, "<Separator>" },
             { "/Chat/_Close",  "<control>C",
-          GtkItemFactoryCallback(chat_close), 0, NULL},
-        { "/_More",    NULL,     NULL, 0, "<Branch>" },
+          GtkItemFactoryCallback(chat_close), 0, 0},
+        { "/_More",    0,   0, 0, "<Branch>" },
         { "/More/_Beep",   "<control>B",
-          GtkItemFactoryCallback(chat_beep_users), 0, NULL},
-//      { "/More/Change Font", NULL,
-//         GtkItemFactoryCallback(chat_change_font), 0, NULL},
+          GtkItemFactoryCallback(chat_beep_users), 0, 0},
+//      { "/More/Change Font", 0,
+//         GtkItemFactoryCallback(chat_change_font), 0, 0},
     };
 
@@ -671 +671 @@
 
     cw->kw->cmbUsers = gtk_combo_new();
-    GList *users = NULL;
+    GList *users = 0;
 
     list<CChatUser *>::iterator iter;
@@ -798 +798 @@
         GTK_OBJECT(GTK_FILE_SELECTION(dlg_save_chat)->cancel_button),
         "clicked", GTK_SIGNAL_FUNC(save_chat_cancel),
-        NULL);
+        0);
     gtk_signal_connect(GTK_OBJECT(dlg_save_chat), "delete_event",
-        GTK_SIGNAL_FUNC(save_chat_cancel), NULL);
+        GTK_SIGNAL_FUNC(save_chat_cancel), 0);
 
     gtk_widget_show_all(dlg_save_chat);
@@ -819 +819 @@
     struct chat_window *cw = (struct chat_window *)temp_cw;
 
-    if(cw->hold_cuser == NULL)
+    if(cw->hold_cuser == 0)
     {
-        cw->chat_user = NULL;
+        cw->chat_user = 0;
         gdk_input_remove(cw->input_tag);
         cw->chatman->CloseChat();
@@ -830 +830 @@
     {
         if(cw->chat_user == cw->hold_cuser)
-            cw->chat_user = NULL;
+            cw->chat_user = 0;
     }
 
@@ -854 +854 @@
     read(pipe, buf, 32);
 
-    CChatEvent *e = NULL;
-    while((e = cw->chatman->PopChatEvent()) != NULL)
+    CChatEvent *e = 0;
+    while((e = cw->chatman->PopChatEvent()) != 0)
     {
         CChatUser *user = e->Client();
@@ -877 +877 @@
                 g_free(temp);
 
-                chat_close((gpointer)cw, 0, NULL);
+                chat_close((gpointer)cw, 0, 0);
                 break;
             }
@@ -896 +896 @@
                 g_free(temp);
 
-                chat_close((gpointer)cw, 0, NULL);
+                chat_close((gpointer)cw, 0, 0);
                 break;
             }
@@ -919 +919 @@
                          filler);
 
-                if(cw->chat_user == NULL)
+                if(cw->chat_user == 0)
                 {
                     cw->chat_user = user;
@@ -1210 +1210 @@
         }
 
-        cw->hold_cuser = NULL;
+        cw->hold_cuser = 0;
         delete e;
     }
@@ -1346 +1346 @@
     char *tmp = gtk_font_selection_dialog_get_font_name(
         GTK_FONT_SELECTION_DIALOG(cw->font_sel_dlg));
-    if(tmp != NULL)
+    if(tmp != 0)
     {
         int len = 0;
@@ -1381 +1381 @@
     GdkFont *font_tmp = gtk_font_selection_dialog_get_font(
         GTK_FONT_SELECTION_DIALOG(cw->font_sel_dlg));
-    if(font_tmp != NULL)
+    if(font_tmp != 0)
         cw->l_font = font_tmp;
 

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

@@ -61 +61 @@
     /* A double click on a user name */
     gtk_signal_connect(GTK_OBJECT(_contact_l), "button_press_event",
-               GTK_SIGNAL_FUNC(contact_list_click), NULL);
+               GTK_SIGNAL_FUNC(contact_list_click), 0);
 
     gtk_clist_set_button_actions(GTK_CLIST(_contact_l), 0, GTK_BUTTON_IGNORED);
@@ -309 +309 @@
     AutoSecureList.clear();
 
-    gtk_clist_set_compare_func(GTK_CLIST(contact_list), NULL);
+    gtk_clist_set_compare_func(GTK_CLIST(contact_list), 0);
     gtk_clist_set_sort_column(GTK_CLIST(contact_list), 0);
     gtk_clist_sort(GTK_CLIST(contact_list));
@@ -337 +337 @@
     gchar str_status[30];
     ICQUser *user;
-    struct conversation *c = NULL;
+    struct conversation *c = 0;
     struct timeval check_timer;
 
@@ -351 +351 @@
 
     /* No user was clicked on */
-    if(user == NULL)
+    if(user == 0)
         return;
 
@@ -358 +358 @@
     {
         /* Fix the stupid contact list double click problem */
-        gettimeofday(&check_timer, NULL);
+        gettimeofday(&check_timer, 0);
 
         if(!((check_timer.tv_sec == timer.tv_sec) &&
@@ -373 +373 @@
         c = convo_find(user->Uin());
         
-        if(c != NULL)
+        if(c != 0)
             gdk_window_raise(c->window->window);
         else
@@ -463 +463 @@
                  GTK_SIGNAL_FUNC(list_delete_user), user);
     
-        gtk_menu_popup(GTK_MENU(_menu), NULL, NULL, NULL, NULL, 
+        gtk_menu_popup(GTK_MENU(_menu), 0, 0, 0, 0, 
                    event->button, event->time);
     

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

@@ -40 +40 @@
         c = convo_find(u->Uin());
 
-        if(c != NULL)
+        if(c != 0)
         {
             if(u->Status() == ICQ_STATUS_OFFLINE)
@@ -91 +91 @@
     }
 
-    return NULL;
+    return 0;
 }
 
@@ -124 +124 @@
 
     /* The entry box */
-    c->entry = gtk_text_new(NULL, NULL);
+    c->entry = gtk_text_new(0, 0);
     gtk_text_set_editable(GTK_TEXT(c->entry), TRUE);
     gtk_signal_connect(GTK_OBJECT(c->entry), "key_press_event",
@@ -132 +132 @@
 
     /* The viewing messages box area */
-    c->text = gtk_text_new(NULL, NULL);
+    c->text = gtk_text_new(0, 0);
     gtk_text_set_editable(GTK_TEXT(c->text), FALSE);
     gtk_text_set_word_wrap(GTK_TEXT(c->text), TRUE);
@@ -138 +138 @@
 
     /* Scroll bar for the messages that are being viewed */
-    scroll = gtk_scrolled_window_new(NULL, GTK_TEXT(c->text)->vadj);
+    scroll = gtk_scrolled_window_new(0, GTK_TEXT(c->text)->vadj);
     gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll),
                        GTK_POLICY_NEVER,
@@ -168 +168 @@
 
     /* Send the message normal */
-    c->send_normal = gtk_radio_button_new_with_label(NULL, "Normal");
+    c->send_normal = gtk_radio_button_new_with_label(0, "Normal");
 
     /* Send the message urgently */
@@ -271 +271 @@
         if(enter_sends && !(eventkey->state & GDK_SHIFT_MASK))
         {
-            convo_send(NULL, (gpointer)c);
+            convo_send(0, (gpointer)c);
         }
         else if(enter_sends)
@@ -391 +391 @@
 
     /* If the window doesn't exist, don't show anything */
-    if(c == NULL)
+    if(c == 0)
     {
         system_status_refresh();
@@ -400 +400 @@
 
     /* Make sure we really have an event */
-    if(u_event == NULL)
+    if(u_event == 0)
     {
         return;

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

@@ -85 +85 @@
 struct status_icon *make_pixmap(struct status_icon *icon, gchar **file)
 {
-    if(icon == NULL)
+    if(icon == 0)
         icon = g_new0(struct status_icon, 1);
         
     icon->pm = gdk_pixmap_create_from_xpm_d(main_window->window,
                         &icon->bm,
-                        NULL,
+                        0,
                         file);
     return icon;
@@ -167 +167 @@
             main_window_show();
             system_status_refresh();
-            dialog_close(NULL, register_window);
+            dialog_close(0, register_window);
         }
         else
@@ -202 +202 @@
 {
     /* Make sure we have the right event and event tag */
-    if( (etd->e_tag == 0 && event != NULL) ||
+    if( (etd->e_tag == 0 && event != 0) ||
         (etd->e_tag != 0 && !event->Equals(etd->e_tag)) )
             return;
@@ -219 +219 @@
     strcpy(temp, etd->buf);
     
-    if(event == NULL)
+    if(event == 0)
     {
         strcat(temp, "error");
@@ -307 +307 @@
 
     /* If the window isn't open, there isn't anything left to do */
-    if(c == NULL)
+    if(c == 0)
         return;