OBJECT_..._DATA --> g_object_..._data

[obnox/wireshark/wip.git] / gtk / sip_stat.c

diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index 4f26d1064c6d25c3dee0a83d438981bb601cb324..6436473b335f6147b45bbaffcf3804aa7f481bfe 100644 (file)
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -4,8 +4,8 @@
  * $Id$
  * Copied from http_stat.c
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -126,7 +126,9 @@ static const value_string vals_status_code[] = {
     { 416, "Unsupported URI Scheme"},
     { 420, "Bad Extension"},
     { 421, "Extension Required"},
+    { 422, "Session Timer Too Small"},
     { 423, "Interval Too Brief"},
+    { 429, "Provide Referrer Identity"},
     { 480, "Temporarily Unavailable"},
     { 481, "Call/Transaction Does Not Exist"},
     { 482, "Loop Detected"},
@@ -139,6 +141,7 @@ static const value_string vals_status_code[] = {
     { 489, "Bad Event"},
     { 491, "Request Pending"},
     { 493, "Undecipherable"},
+    { 494, "Security Agreement Required"},
     { 499, "Client Error - Others"},
 
     { 500, "Server Internal Error"},
@@ -159,6 +162,9 @@ static const value_string vals_status_code[] = {
     { 0,       NULL}
 };
 
+void register_tap_listener_gtksipstat(void);
+
+
 /* Create tables for responses and requests */
 static void
 sip_init_hash(sipstat_t *sp)
@@ -193,6 +199,8 @@ sip_draw_hash_requests(gchar *key _U_ , sip_request_method_t *data, gchar * unus
 {
     gchar string_buff[SUM_STR_MAX];
 
+    g_assert(data!=NULL);
+
     if (data->packets==0)
     {
         return;
@@ -222,10 +230,8 @@ sip_draw_hash_responses(gint * key _U_ , sip_response_code_t *data, gchar * unus
 {
     gchar string_buff[SUM_STR_MAX];
 
-    if (data==NULL)
-    {
-        g_warning("C'est quoi ce borderl key=%d\n", *key);
-    }
+    g_assert(data!=NULL);
+
     if (data->packets==0)
     {
         return;
@@ -637,7 +643,7 @@ gtk_sipstat_init(const char *optarg, void *userdata _U_)
     bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
     gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
 
-    bt_close = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE);
+    bt_close = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
     window_set_cancel_button(sp->win, bt_close, window_cancel_button_cb);
 
     SIGNAL_CONNECT(sp->win, "delete_event", window_delete_event_cb, NULL);