X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Ftoolbar.c;h=a01986d9e26a3c2cf5e44aa318b6883e9d1b270e;hb=25fba83632ff8e52e801b57189379803d70a228b;hp=8a7eb4a227e228d3cca56c2ef5b635ed384ea068;hpb=6550d71135aed5d81a76d7d5625757570bcf0819;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 8a7eb4a2..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,6 +16,10 @@
  * MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <lttv/lttv.h>
 #include <lttvwindow/toolbar.h>
 
@@ -37,14 +41,11 @@ LttvToolbarClosure lttv_toolbars_add(LttvToolbars *h,
 {
   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;
 }
@@ -52,7 +53,7 @@ LttvToolbarClosure lttv_toolbars_add(LttvToolbars *h,
 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++){