Get data root dif info from configure

Also fixes the path to the about dialog pixmap.
This commit is contained in:
Łukasz Jernaś 2010-12-02 22:31:35 +01:00
parent 365bcf5bb8
commit b6b481d738
5 changed files with 8 additions and 7 deletions

View file

@ -22,6 +22,7 @@ namespace SparkleLib {
public const string VERSION = "@VERSION@";
public const string LOCALE_DIR = "@prefix@/share/locale";
public const string DATAROOTDIR = "@expanded_datadir@";
public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
public const string PREFIX = "@prefix@";
public const string OPEN_COMMAND = "xdg-open";

View file

@ -40,7 +40,7 @@ namespace SparkleLib {
public static string SparkleLocalIconPath = SparkleHelpers.CombineMore (SparkleConfigPath, "icons", "hicolor");
public static string SparkleIconPath = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "sparkleshare",
public static string SparkleIconPath = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare",
"icons");

View file

@ -194,9 +194,9 @@ GNU Lesser General Public License for more details."; */
vbox.PackStart (new HSeparator (), false, false, 0);
vbox.PackStart (button_bar, false, false, 0);
string image_path = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "pixmaps",
"sparkleshare-about.png");
string image_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare",
"pixmaps", "sparkleshare-about.png");
System.Console.WriteLine(image_path);
wrapper.PackStart (new Image (image_path), false, false, 0);
wrapper.PackStart (vbox, true, true, 0);

View file

@ -146,7 +146,7 @@ namespace SparkleShare {
Directory.CreateDirectory (SparklePaths.SparklePath);
SparkleHelpers.DebugInfo ("Controller", "Created '" + SparklePaths.SparklePath + "'");
string icon_file_path = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "icons", "hicolor",
string icon_file_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "icons", "hicolor",
"48x48", "apps", "folder-sparkleshare.png");
string gvfs_command_path = SparkleHelpers.CombineMore (Path.VolumeSeparatorChar.ToString (),
@ -196,4 +196,4 @@ namespace SparkleShare {
}
}
}

View file

@ -48,7 +48,7 @@ namespace SparkleShare {
HBox = new HBox (false, 6);
string image_path = SparkleHelpers.CombineMore (Defines.PREFIX, "share", "sparkleshare",
string image_path = SparkleHelpers.CombineMore (Defines.DATAROOTDIR, "sparkleshare",
"pixmaps", "side-splash.png");
Image side_splash = new Image (image_path);