X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Ftoolbar.c;h=72f4a1573bf87e4bc985d3126f51d5b941aee920;hb=bcacff8e2fc03007501455792b55b793996d336a;hp=618cc412a1f5a48ed41beae0392c5e94c048cb9f;hpb=7afc14aa328665480b57e91234740392c8a236b1;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 618cc412..72f4a157 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/toolbar.c @@ -19,31 +19,29 @@ #include #include - -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; } @@ -51,7 +49,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;ilen;i++){