- Started to convert debug points to use glib log API

- Moved common stuff to common/

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4239 818b1a75-f10b-46b9-bf7c-635c3b92a50f

common/utils/itti_analyzer/libui/Makefile.am

@@ -1,5 +1,6 @@
 AM_CFLAGS =	\
 	@ADD_CFLAGS@	\
+	-I$(top_srcdir)/common	\
 	-I$(top_srcdir)/libbuffers	\
 	-I$(top_srcdir)/libparser
 

common/utils/itti_analyzer/libui/ui_callbacks.c

@@ -3,7 +3,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../rc.h"
+#include "rc.h"
 
 #include "ui_main_screen.h"
 #include "ui_callbacks.h"
@@ -16,7 +16,7 @@ gboolean ui_callback_on_open(GtkWidget *widget,
                              GdkEvent  *event,
                              gpointer   data)
 {
-    g_print ("Open event occurred\n");
+    g_debug("Open event occurred");
     CHECK_FCT(ui_file_chooser());
     return TRUE;
 }
@@ -61,7 +61,7 @@ ui_callback_on_select_signal(GtkTreeSelection *selection,
         }
         else
         {
-            g_print ("%s is going to be unselected.\n", name);
+            g_debug("%s is going to be unselected", name);
         }
 
         g_free(name);
@@ -77,7 +77,7 @@ gboolean ui_callback_on_connect(GtkWidget *widget,
     uint16_t port;
     const char *ip;
 
-    g_print ("Connect event occurred\n");
+    g_debug("Connect event occurred");
 
     port = atoi(gtk_entry_get_text(GTK_ENTRY(ui_main_data.portentry)));
     ip = gtk_entry_get_text(GTK_ENTRY(ui_main_data.ipentry));
@@ -94,7 +94,7 @@ gboolean ui_callback_on_disconnect(GtkWidget *widget,
 {
     /* We have to retrieve the ip address and port of remote host */
 
-    g_print ("Disconnect event occurred\n");
+    g_debug("Disconnect event occurred");
     ui_interface.socket_disconnect();
     return TRUE;
 }
@@ -104,8 +104,7 @@ gboolean ui_callback_on_tree_view_select(GtkWidget *widget,
                                          gpointer   data)
 {
     /* We have to retrieve the ip address and port of remote host */
-
-    g_print ("List selection event occurred\n");
+    g_debug("List selection event occurred");
     return TRUE;
 }
 

common/utils/itti_analyzer/libui/ui_main_screen.c

@@ -9,7 +9,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../rc.h"
+#include "rc.h"
 
 #include "ui_interface.h"
 #include "ui_main_screen.h"
@@ -26,20 +26,8 @@ int ui_gtk_initialize(int argc, char *argv[])
 
     memset(&ui_main_data, 0, sizeof(ui_main_data_t));
 
-    if (!g_thread_supported())
-        g_thread_init(NULL);
-
-    /* Secure gtk */
-    gdk_threads_init();
-
-    /* Obtain gtk's global lock */
-    gdk_threads_enter();
-
-    /* Initialize the widget set */
-    gtk_init(&argc, &argv);
-
     /* Create the main window */
-    ui_main_data.window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    ui_main_data.window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 
     gtk_window_set_position(GTK_WINDOW(ui_main_data.window), GTK_WIN_POS_CENTER);
     gtk_window_set_default_size(GTK_WINDOW(ui_main_data.window), 1024, 800);

common/utils/itti_analyzer/libui/ui_menu_bar.c

@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 
-#include "../rc.h"
+#include "rc.h"
 #include "ui_main_screen.h"
 #include "ui_menu_bar.h"
 #include "ui_callbacks.h"

common/utils/itti_analyzer/libui/ui_notebook.c

@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <gtk/gtk.h>
 
-#include "../rc.h"
+#include "rc.h"
 
 #include "ui_notebook.h"
 #include "ui_tree_view.h"

common/utils/itti_analyzer/libui/ui_notifications.c

@@ -4,7 +4,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../rc.h"
+#include "rc.h"
 
 #include "ui_interface.h"
 #include "ui_main_screen.h"

common/utils/itti_analyzer/libui/ui_signal_dissect_view.c

@@ -2,7 +2,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../rc.h"
+#include "rc.h"
 
 #include "ui_main_screen.h"
 #include "ui_menu_bar.h"

common/utils/itti_analyzer/libui/ui_tree_view.c

@@ -3,7 +3,7 @@
 
 #include <gtk/gtk.h>
 
-#include "../rc.h"
+#include "rc.h"
 
 #include "ui_main_screen.h"
 #include "ui_tree_view.h"