projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update FSF address
[lttv.git]
/
lttv
/
modules
/
gui
/
lttvwindow
/
lttvwindow
/
lttvwindow.c
diff --git
a/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
b/lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
index 60c18157cecbd99d106298c9628ac8f52e54421e..66639b4f72e7c1f63a396fa25e0dc55772bc33a4 100644
(file)
--- a/
lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
+++ b/
lttv/modules/gui/lttvwindow/lttvwindow/lttvwindow.c
@@
-12,8
+12,8
@@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 5
9 Temple Place - Suite 330
, Boston,
- * MA 0211
1-1307
, USA.
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston,
+ * MA 0211
0-1301
, USA.
*/
/*! \file lttvwindow.c
*/
/*! \file lttvwindow.c
@@
-32,14
+32,14
@@
#include <config.h>
#endif
#include <config.h>
#endif
-#include <ltt/ltt.h>
#include <lttv/lttv.h>
#include <lttv/state.h>
#include <lttv/lttv.h>
#include <lttv/state.h>
+#include <lttv/traceset.h>
#ifdef BABEL_CLEANUP
#include <lttv/stats.h>
#endif /* BABEL_CLEANUP */
#include <lttvwindow/mainwindow.h>
#ifdef BABEL_CLEANUP
#include <lttv/stats.h>
#endif /* BABEL_CLEANUP */
#include <lttvwindow/mainwindow.h>
-#include <lttvwindow/mainwindow-private.h>
+#include <lttvwindow/mainwindow-private.h>
#include <lttvwindow/lttvwindow.h>
#include <lttvwindow/toolbar.h>
#include <lttvwindow/menu.h>
#include <lttvwindow/lttvwindow.h>
#include <lttvwindow/toolbar.h>
#include <lttvwindow/menu.h>
@@
-118,13
+118,11
@@
void set_current_time(Tab *tab, const LttTime *current_time)
void set_current_position(Tab *tab, const LttvTracesetPosition *pos)
{
void set_current_position(Tab *tab, const LttvTracesetPosition *pos)
{
- #ifdef BABEL_CLEANUP
-
LttvAttributeValue value;
LttvHooks * tmp;
gboolean retval;
LttvAttributeValue value;
LttvHooks * tmp;
gboolean retval;
- tab->current_time = lttv_traceset_
context_
position_get_time(pos);
+ tab->current_time = lttv_traceset_position_get_time(pos);
retval= lttv_iattribute_find_by_path(tab->attributes,
"hooks/updatecurrentposition", LTTV_POINTER, &value);
retval= lttv_iattribute_find_by_path(tab->attributes,
"hooks/updatecurrentposition", LTTV_POINTER, &value);
@@
-133,7
+131,6
@@
void set_current_position(Tab *tab, const LttvTracesetPosition *pos)
if (tmp != NULL) {
lttv_hooks_call(tmp, (void *) pos);
}
if (tmp != NULL) {
lttv_hooks_call(tmp, (void *) pos);
}
-#endif /*BABEL_CLEANUP*/
}
void add_toolbar_constructor(MainWindow *mw, LttvToolbarClosure *toolbar_c)
}
void add_toolbar_constructor(MainWindow *mw, LttvToolbarClosure *toolbar_c)
@@
-1144,8
+1141,12
@@
__EXPORT gboolean lttvwindow_events_request_pending(Tab *tab)
{
GSList *element = tab->events_requests;
{
GSList *element = tab->events_requests;
- if(element == NULL) return FALSE;
- else return TRUE;
+ if(element == NULL){
+ return FALSE;
+ }
+ else {
+ return TRUE;
+ }
}
}
@@
-1231,20
+1232,30
@@
__EXPORT LttvTracesetStats* lttvwindow_get_traceset_stats(Tab *tab)
}
#endif /*BABEL_CLEANUP*/
}
#endif /*BABEL_CLEANUP*/
+__EXPORT LttvTraceset *lttvwindow_get_traceset(Tab *tab)
+{
+ return tab->traceset_info->traceset;
+}
+
void events_request_free(EventsRequest *events_request)
{
void events_request_free(EventsRequest *events_request)
{
- #ifdef BABEL_CLEANUP
+
if(events_request == NULL) return;
if(events_request->start_position != NULL)
if(events_request == NULL) return;
if(events_request->start_position != NULL)
- lttv_traceset_
context_position_destroy
(events_request->start_position);
+ lttv_traceset_
destroy_position
(events_request->start_position);
if(events_request->end_position != NULL)
if(events_request->end_position != NULL)
- lttv_traceset_context_position_destroy(events_request->end_position);
- if(events_request->hooks != NULL) {
+ lttv_traceset_destroy_position(events_request->end_position);
+#ifdef BABEL_CLEANUP
+ if(events_request->hooks != NULL) {
GArray *hooks = events_request->hooks;
GArray *hooks = events_request->hooks;
+
lttv_trace_hook_remove_all(&hooks);
lttv_trace_hook_remove_all(&hooks);
+
g_array_free(events_request->hooks, TRUE);
g_array_free(events_request->hooks, TRUE);
+
}
}
+
if(events_request->before_chunk_traceset != NULL)
lttv_hooks_destroy(events_request->before_chunk_traceset);
if(events_request->before_chunk_trace != NULL)
if(events_request->before_chunk_traceset != NULL)
lttv_hooks_destroy(events_request->before_chunk_traceset);
if(events_request->before_chunk_trace != NULL)
@@
-1253,8
+1264,6
@@
void events_request_free(EventsRequest *events_request)
lttv_hooks_destroy(events_request->before_chunk_tracefile);
if(events_request->event != NULL)
lttv_hooks_destroy(events_request->event);
lttv_hooks_destroy(events_request->before_chunk_tracefile);
if(events_request->event != NULL)
lttv_hooks_destroy(events_request->event);
- if(events_request->event_by_id_channel != NULL)
- lttv_hooks_by_id_channel_destroy(events_request->event_by_id_channel);
if(events_request->after_chunk_tracefile != NULL)
lttv_hooks_destroy(events_request->after_chunk_tracefile);
if(events_request->after_chunk_trace != NULL)
if(events_request->after_chunk_tracefile != NULL)
lttv_hooks_destroy(events_request->after_chunk_tracefile);
if(events_request->after_chunk_trace != NULL)
@@
-1265,9
+1274,10
@@
void events_request_free(EventsRequest *events_request)
lttv_hooks_destroy(events_request->before_request);
if(events_request->after_request != NULL)
lttv_hooks_destroy(events_request->after_request);
lttv_hooks_destroy(events_request->before_request);
if(events_request->after_request != NULL)
lttv_hooks_destroy(events_request->after_request);
-
+#endif /*BABEL_CLEANUP*/
g_free(events_request);
g_free(events_request);
- #endif /*BABEL_CLEANUP*/
+
+
}
}
This page took
0.024707 seconds
and
4
git commands to generate.