← Back to branch summary

~paulbrianstewart/ubuntu/oneiric/gcompris/825448-Spelling-And-Grammar-Error

« back to all changes in this revision

Viewing changes to src/gcompris/binreloc.c

  • Committer: Bazaar Package Importer
  • Author(s): Yann Dirson
  • Date: 2010-06-27 22:51:30 UTC
  • mfrom: (1.1.16 upstream) (5.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20100627225130-mf7h4m5r8m7bd9fb
Tags: 9.3-1
* New upstream release.
* Drop GTK_DISABLE_DEPRECATED patch, useless for now.
* Provide RELEASE_NOTE_9.3.txt downloaded from sourceforge.
* New voice package for Asturian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gcompris/binreloc.c
25
25
#include <string.h>
26
26
#include "binreloc.h"
27
27
 
 
28
#ifdef MAC_INTEGRATION
 
29
#include <igemacintegration/ige-mac-bundle.h>
 
30
static IgeMacBundle *bundle = NULL;
 
31
#endif
 
32
 
28
33
G_BEGIN_DECLS
29
34
 
30
35
 
46
51
           relocation code for windows. Unfortunately this is not
47
52
           the case and we have to add this manually. This is only
48
53
           one possibility; other ways of looking up the full path
49
 
           of gnucash-bin.exe probably exist.*/
 
54
           of gcompris-bin.exe probably exist.*/
50
55
        gchar *prefix;
51
56
        gchar *result;
52
57
 
55
60
           the current process */
56
61
        prefix = g_win32_get_package_installation_directory_of_module (NULL);
57
62
        result = g_build_filename (prefix,
58
 
                                   "bin", "gnucash-bin.exe",
 
63
                                   "bin", "gcompris.exe",
59
64
                                   (char*)NULL);
60
65
        g_free (prefix);
61
66
        return result;
76
81
        ige_mac_bundle_setup_environment(bundle);
77
82
        prefix = g_strdup(ige_mac_bundle_get_path(bundle));
78
83
        result = g_build_filename(prefix, "Contents/MacOS",
79
 
                                  "gnucash-bin", NULL);
 
84
                                  "GCompris-bin", NULL);
80
85
        g_free(prefix);
81
86
        return result;
82
87
#else
595
600
                        return NULL;
596
601
        }
597
602
 
 
603
#ifdef MAC_INTEGRATION
 
604
        dir = g_strdup(ige_mac_bundle_get_datadir(bundle));
 
605
#else
598
606
        dir = g_build_filename (prefix, "share", NULL);
 
607
#endif
599
608
        g_free (prefix);
600
609
        return dir;
601
610
}
628
637
                        return NULL;
629
638
        }
630
639
 
 
640
#ifdef MAC_INTEGRATION
 
641
        dir = g_strdup(ige_mac_bundle_get_localedir(bundle));
 
642
#else
631
643
        dir = g_build_filename (data_dir, "locale", NULL);
 
644
#endif
632
645
        g_free (data_dir);
633
646
        return dir;
634
647
}
661
674
                        return NULL;
662
675
        }
663
676
 
 
677
#ifdef MAC_INTEGRATION
 
678
        dir = g_build_filename(ige_mac_bundle_get_datadir(bundle),
 
679
                               "..", "lib", NULL);
 
680
#else
664
681
        if (default_lib_dir && strstr(default_lib_dir, "lib64"))
665
682
                dir = g_build_filename (prefix, "lib64", NULL);
666
683
        else
667
684
                dir = g_build_filename (prefix, "lib", NULL);
 
685
#endif
668
686
        g_free (prefix);
669
687
        return dir;
670
688
}