Changeset 252

Timestamp:

06/04/08 21:39:02 (4 years ago)

Author:

ath

Message:

Pick up latest commits from the "fixes" branch.

Location:

trunk

Files:

• fm_gui/src/global.c (modified) (4 diffs)
• fm_server/src/fm_output.c (modified) (2 diffs)

trunk/fm_gui/src/global.c

@@ -1 @@
-#include <string.h>
 #include <glib.h>
 #ifdef G_OS_WIN32
@@ -14 +13 @@
 #include "binreloc.h"
 
-#define LIBDIR_SUFFIX ".libs"
-
 
 static gchar *prefix;
+static gchar *exe_path;
 static gchar *bin_path;
 //static gchar *lib_path;
@@ -27 +25 @@
 {
         GError *err = NULL;
-        gchar *prefix_temp;
 
 #ifdef G_OS_WIN32
-        TCHAR exe_filename[MAX_PATH];
+        TCHAR path[MAX_PATH];
         
-        GetModuleFileName (NULL, exe_filename, MAX_PATH);
+        GetModuleFileName (NULL, path, MAX_PATH);
         
         exe_path = g_path_get_dirname (path);
-        g_print ("Executable is %s\n", exe_filename);
-        prefix_temp = g_strdup (prefix_temp);
 #else
-
-        gboolean in_source_dir;
-
         if (gbr_init (&err))
                 g_print("binreloc available!\n");
@@ -49 +41 @@
         if (!exe_filename)
                 g_warning ("Can't determine installation prefix!");
-        else
-                g_print ("Executable is %s\n", exe_filename);
 
-        prefix_temp = g_path_get_dirname (exe_filename);
-        g_print ("prefix_temp %s\n", prefix_temp);
-        gchar *basename = g_path_get_basename (prefix_temp);
-        g_print ("basename %s\n", basename);
+        exe_path = g_path_get_dirname (exe_filename);   
+        g_free (exe_filename);
+#endif
 
-        if (strcmp (basename, LIBDIR_SUFFIX) == 0) {
-                g_print ("we are in a libtool temporary directory, adjusting path...\n");
+        gchar *makefile_name = g_build_filename (exe_path, "Makefile.am", NULL);
+        gchar *data_path_temp = NULL;
+        if (g_file_test (makefile_name, G_FILE_TEST_EXISTS)) {
+                g_print ("%s exists, we are in the source directory\n", makefile_name);
 
-                prefix_temp = g_strdup (prefix_temp);
-                prefix_temp[strlen (prefix_temp) - strlen (LIBDIR_SUFFIX) - 1] = '\0';
+                prefix = g_path_get_dirname (exe_path);
+                bin_path = g_strdup (exe_path);
+                data_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "data", NULL);
+        } else {
+                prefix = gbr_find_prefix (PREFIX);
+
+#ifdef G_OS_WIN32       
+                bin_path = g_build_path (G_DIR_SEPARATOR_S, path, "bin", NULL);
+//              lib_path = g_build_path (G_DIR_SEPARATOR_S, path, "lib", NULL);
+                data_path_temp = g_build_path (G_DIR_SEPARATOR_S, path, "share", NULL);
+#else
+                bin_path = gbr_find_lib_dir (PREFIX "/bin");
+//              lib_path = gbr_find_lib_dir (PREFIX "/lib");
+                data_path_temp = gbr_find_data_dir (PREFIX "/share/fm_gui");
+#endif
+                data_path = g_build_path (G_DIR_SEPARATOR_S, data_path_temp, "fm_gui", NULL);
         }
 
-        g_free (basename);
 
-        basename = g_path_get_basename (prefix_temp);
-
-        if (strcmp (basename, "src") == 0)
-                in_source_dir = TRUE;
-        else
-                in_source_dir = FALSE;
-
-        prefix_temp[strlen (prefix_temp) - strlen (basename)] = '\0';
-
-        g_free (basename);
-
-
-#endif
-
-        g_print ("base path %s --- ", prefix_temp);
-        if (in_source_dir) {
-                g_print ("source directory\n");
-
-                prefix = g_strdup (prefix_temp);
-                bin_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "src", NULL);
-                data_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "data", NULL);
-
-        } else {
-                g_print ("installation directory\n");
-
-                prefix = g_strdup (prefix_temp);
-                bin_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "bin", NULL);
-                data_path = g_build_path (G_DIR_SEPARATOR_S, prefix, "share", PACKAGE, NULL);
-
-        }
         
-        g_free (prefix_temp);
+        g_free (makefile_name);
 
         g_print ("prefix %s\n", prefix);
-        g_print ("bin_path %s\n", bin_path);
+        g_print ("exe_path %s\n", exe_path);
         g_print ("data_path %s\n", data_path);
 }

trunk/fm_server/src/fm_output.c

@@ -108 +108 @@
 fm_output_start                         (FmOutput       *output)
 {
-        FmOutputClass *klass = FM_OUTPUT_GET_CLASS (output);
-        FmElement *element = FM_ELEMENT (output);
-
-        if (!element->active) {
-                g_warning ("element \"%s\" is not active, cancel start!",
-                         fm_element_get_name (FM_ELEMENT (output)));
-                return FALSE;
-        }
-
-        if (klass->start)
-                return (*klass->start) (output);
+        FmOutputClass *class = FM_OUTPUT_GET_CLASS(output);
+        
+        if (class->start)
+                return (*class->start)(output);
         else {
                 g_warning ("\"start\" method not defined for element \"%s\"!",
-                         fm_element_get_name (FM_ELEMENT (output)));
+                         fm_element_get_name(FM_ELEMENT(output)));
                 return FALSE;
         }
@@ -130 +123 @@
 fm_output_stop                          (FmOutput       *output)
 {
-        FmOutputClass *klass = FM_OUTPUT_GET_CLASS (output);
-        FmElement *element = FM_ELEMENT (output);
-
-        if (!element->active) {
-                g_warning ("element \"%s\" is not active, cancel start!",
-                         fm_element_get_name (FM_ELEMENT (output)));
-                return FALSE;           
-        }
+        FmOutputClass *class = FM_OUTPUT_GET_CLASS(output);
         
-        if (klass->stop)
-                return (*klass->stop) (output);
+        if (class->stop)
+                return (*class->stop)(output);
         else {
                 g_warning ("\"stop\" method not defined for element \"%s\"!",
-                         fm_element_get_name (FM_ELEMENT (output)));
+                         fm_element_get_name(FM_ELEMENT(output)));
                 return FALSE;
         }