Partial revert "Disable sync/"

[lttv.git] / lttv / modules / gui / lttvwindow / lttvwindow / init_module.c

diff --git a/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c b/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
index 83d35c96ca0ed274bd1f4c0cb38d2a28e4318c93..99ab15f73972158ad4d9ab6d34736a610ec8e46b 100644 (file)
--- a/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
+++ b/lttv/modules/gui/lttvwindow/lttvwindow/init_module.c
@@ -119,7 +119,7 @@ static gboolean window_creation_hook(void *hook_data, void *call_data)
   gtk_set_locale ();
   gtk_init (&lttv_argc, &lttv_argv);
 
-  add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
+  add_pixmap_directory (PACKAGE_DATA_DIR "/pixmaps/" PACKAGE);
   add_pixmap_directory ("pixmaps");
   add_pixmap_directory ("../modules/gui/main/pixmaps");
 
@@ -134,6 +134,7 @@ static gboolean window_creation_hook(void *hook_data, void *call_data)
 static void init() {
 
   LttvAttributeValue value;
+  gboolean retval;
  
   // Global attributes only used for interaction with main() here.
   LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
@@ -173,8 +174,9 @@ static void init() {
       "pathname of the directory containing the trace", 
       LTTV_OPT_STRING, &a_trace, lttv_trace_option, NULL);
 
-  g_assert(lttv_iattribute_find_by_path(attributes, "hooks/main/before",
-      LTTV_POINTER, &value));
+  retval= lttv_iattribute_find_by_path(attributes, "hooks/main/before",
+    LTTV_POINTER, &value);
+  g_assert(retval);
   g_assert((main_hooks = *(value.v_pointer)) != NULL);
 
   lttv_hooks_add(main_hooks, window_creation_hook, NULL, LTTV_PRIO_DEFAULT);
@@ -257,4 +259,4 @@ static void destroy() {
 
 LTTV_MODULE("lttvwindow", "Viewer main window", \
     "Viewer with multiple windows, tabs and panes for graphical modules", \
-           init, destroy, "stats", "option")
+           init, destroy, "stats", "option", "sync")