X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Ftoolbar.c;h=a01986d9e26a3c2cf5e44aa318b6883e9d1b270e;hb=7df20ca43b06343b299d2a79512a44441f148f1d;hp=feda92c57e830fa250d99c378acc22fce492eae1;hpb=2d262115fc06b5ffb6038207a6d0c1d5f81763c2;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c
index feda92c5..a01986d9 100644
--- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c
+++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c
@@ -16,33 +16,36 @@
  * MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <lttv/lttv.h>
 #include <lttvwindow/toolbar.h>
 
-inline LttvToolbars *lttv_toolbars_new() {
+LttvToolbars *lttv_toolbars_new() {
   return g_array_new(FALSE, FALSE, sizeof(LttvToolbarClosure));
 }
 
 /* MD: delete elements of the array also, but don't free pointed addresses
  * (functions).
  */
-inline void lttv_toolbars_destroy(LttvToolbars *h) {
+void lttv_toolbars_destroy(LttvToolbars *h) {
   g_debug("lttv_toolbars_destroy");
   g_array_free(h, TRUE);
 }
 
-inline LttvToolbarClosure lttv_toolbars_add(LttvToolbars *h, lttvwindow_viewer_constructor f, char* tooltip, char ** pixmap, GtkWidget *widget)
+LttvToolbarClosure lttv_toolbars_add(LttvToolbars *h,
+    lttvwindow_viewer_constructor f,
+    char* tooltip, char ** pixmap, GtkWidget *widget)
 {
   LttvToolbarClosure c;
 
-  /* if h is null, do nothing, or popup a warning message */
-  if(h == NULL)return;
-
   c.con = f;
   c.tooltip = tooltip;
   c.pixmap = pixmap;
   c.widget = widget;
-  g_array_append_val(h,c);
+  if(h != NULL) g_array_append_val(h,c);
 
   return c;
 }
@@ -50,7 +53,7 @@ inline LttvToolbarClosure lttv_toolbars_add(LttvToolbars *h, lttvwindow_viewer_c
 GtkWidget *lttv_toolbars_remove(LttvToolbars *h, lttvwindow_viewer_constructor f)
 {
   LttvToolbarClosure * tmp;
-  gint i;
+  guint i;
   GtkWidget *widget;
 
   for(i=0;i<h->len;i++){