projects
/
lttv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust the includes now that some paths have changed
[lttv.git]
/
ltt
/
branches
/
poly
/
lttv
/
modules
/
gui
/
main
/
src
/
init_module.c
diff --git
a/ltt/branches/poly/lttv/modules/gui/main/src/init_module.c
b/ltt/branches/poly/lttv/modules/gui/main/src/init_module.c
index bee64775432689d9bd77f4159d8cf0868d136888..31fb5923a59f77d8a501dc9e7e638716a062cede 100644
(file)
--- a/
ltt/branches/poly/lttv/modules/gui/main/src/init_module.c
+++ b/
ltt/branches/poly/lttv/modules/gui/main/src/init_module.c
@@
-32,22
+32,19
@@
#include <lttv/hook.h>
#include <lttv/option.h>
#include <lttv/module.h>
#include <lttv/hook.h>
#include <lttv/option.h>
#include <lttv/module.h>
-#include <lttv/
processTrace
.h>
+#include <lttv/
tracecontext
.h>
#include <lttv/state.h>
#include <lttv/stats.h>
#include <lttv/state.h>
#include <lttv/stats.h>
-#include <lttv/menu.h>
-#include <lttv/toolbar.h>
+#include <lttv
gui
/menu.h>
+#include <lttv
gui
/toolbar.h>
#include "interface.h"
#include "support.h"
#include "interface.h"
#include "support.h"
-#include <lttv
/mainW
indow.h>
+#include <lttv
gui/mainw
indow.h>
#include "callbacks.h"
#include <ltt/trace.h>
#include "callbacks.h"
#include <ltt/trace.h>
-/* global variable */
-static WindowCreationData win_creation_data;
-
/** Array containing instanced objects. */
GSList * g_main_window_list = NULL ;
/** Array containing instanced objects. */
GSList * g_main_window_list = NULL ;
@@
-79,9
+76,7
@@
void lttv_trace_option(void *hook_data)
static gboolean window_creation_hook(void *hook_data, void *call_data)
{
static gboolean window_creation_hook(void *hook_data, void *call_data)
{
- WindowCreationData* window_creation_data = (WindowCreationData*)hook_data;
-
- g_critical("GUI window_creation_hook()");
+ g_debug("GUI window_creation_hook()");
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
#ifdef ENABLE_NLS
bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
@@
-89,27
+84,27
@@
static gboolean window_creation_hook(void *hook_data, void *call_data)
#endif
gtk_set_locale ();
#endif
gtk_set_locale ();
- gtk_init (&
(window_creation_data->argc), &(window_creation_data->argv)
);
+ gtk_init (&
lttv_argc, <tv_argv
);
add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
add_pixmap_directory ("pixmaps");
add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
add_pixmap_directory ("pixmaps");
- add_pixmap_directory ("
modules/gui/mainW
in/pixmaps");
+ add_pixmap_directory ("
../modules/gui/ma
in/pixmaps");
- construct_main_window(NULL
, window_creation_data
);
+ construct_main_window(NULL);
gtk_main ();
return FALSE;
}
gtk_main ();
return FALSE;
}
-
G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]
) {
+
static void init(
) {
LttvAttributeValue value;
// Global attributes only used for interaction with main() here.
LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
LttvAttributeValue value;
// Global attributes only used for interaction with main() here.
LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
- g_
critical
("GUI init()");
+ g_
debug
("GUI init()");
lttv_option_add("trace", 't',
"add a trace to the trace set to analyse",
lttv_option_add("trace", 't',
"add a trace to the trace set to analyse",
@@
-120,10
+115,7
@@
G_MODULE_EXPORT void init(LttvModule *self, int argc, char *argv[]) {
LTTV_POINTER, &value));
g_assert((main_hooks = *(value.v_pointer)) != NULL);
LTTV_POINTER, &value));
g_assert((main_hooks = *(value.v_pointer)) != NULL);
- win_creation_data.argc = argc;
- win_creation_data.argv = argv;
-
- lttv_hooks_add(main_hooks, window_creation_hook, &win_creation_data);
+ lttv_hooks_add(main_hooks, window_creation_hook, NULL);
}
}
@@
-174,16
+166,16
@@
void main_window_destroy_walk(gpointer data, gpointer user_data)
* This function releases the memory reserved by the module and unregisters
* everything that has been registered in the gtkTraceSet API.
*/
* This function releases the memory reserved by the module and unregisters
* everything that has been registered in the gtkTraceSet API.
*/
-
G_MODULE_EXPORT
void destroy() {
+
static
void destroy() {
LttvAttributeValue value;
LttvTrace *trace;
lttv_option_remove("trace");
LttvAttributeValue value;
LttvTrace *trace;
lttv_option_remove("trace");
- lttv_hooks_remove_data(main_hooks, window_creation_hook,
&win_creation_data
);
+ lttv_hooks_remove_data(main_hooks, window_creation_hook,
NULL
);
- g_
critical
("GUI destroy()");
+ g_
debug
("GUI destroy()");
if(g_main_window_list){
g_slist_foreach(g_main_window_list, main_window_destroy_walk, NULL );
if(g_main_window_list){
g_slist_foreach(g_main_window_list, main_window_destroy_walk, NULL );
@@
-193,5
+185,6
@@
G_MODULE_EXPORT void destroy() {
}
}
-
-
+LTTV_MODULE("mainwin", "Viewer main window", \
+ "Viewer with multiple windows, tabs and panes for graphical modules", \
+ init, destroy, "stats")
This page took
0.024446 seconds
and
4
git commands to generate.