fix paths

SVN revision: 3962

diff --git a/src/border.c b/src/border.c
index dcb645e..9500a44 100644 (file)
--- a/src/border.c
+++ b/src/border.c
@@ -376,7 +376,7 @@ e_focus_out(Eevent * ev)
        b = e_border_find_by_window(e->win);
        if (b)
          {     
-            char *settings_db = "./settings.db";
+            char *settings_db = PACKAGE_DATA_DIR"/settings.db";
             E_DB_File *db;
             int focus_mode;
             char buf[4096];
@@ -956,9 +956,9 @@ e_border_apply_border(E_Border *b)
    int pl, pr, pt, pb;
    
    if ((!b->client.titlebar) && 
-       (!b->client.border)) e_border_set_bits(b, "../data/borderless.bits.db");
-   else if (b->current.selected) e_border_set_bits(b, "../data/border.bits.db");
-   else                     e_border_set_bits(b, "../data/border2.bits.db");
+       (!b->client.border)) e_border_set_bits(b, PACKAGE_DATA_DIR"/borderless.bits.db");
+   else if (b->current.selected) e_border_set_bits(b, PACKAGE_DATA_DIR"/border.bits.db");
+   else                     e_border_set_bits(b, PACKAGE_DATA_DIR"/border2.bits.db");
 
    pl = pr = pt = pb = 0;
    if (b->bits.t) ebits_get_insets(b->bits.t, &pl, &pr, &pt, &pb);   
@@ -1034,7 +1034,7 @@ e_border_new(void)
    int max_colors = 216;
    int font_cache = 1024 * 1024;
    int image_cache = 8192 * 1024;
-   char *font_dir = "./fnt";
+   char *font_dir = PACKAGE_DATA_DIR"/fnt";
    E_Desktop *desk;
    
    b = NEW(E_Border, 1);
@@ -1190,8 +1190,8 @@ e_border_remove_mouse_grabs(E_Border *b)
 void
 e_border_attach_mouse_grabs(E_Border *b)
 {
-   char *grabs_db = "./grabs.db";
-   char *settings_db = "./settings.db";
+   char *grabs_db = PACKAGE_DATA_DIR"/grabs.db";
+   char *settings_db = PACKAGE_DATA_DIR"/settings.db";
    E_DB_File *db;
    int focus_mode;
    char buf[4096];
@@ -1283,8 +1283,8 @@ e_border_attach_all_mouse_grabs(void)
 void
 e_border_redo_grabs(void)
 {   
-   char *grabs_db = "./grabs.db";
-   char *settings_db = "./settings.db";
+   char *grabs_db = PACKAGE_DATA_DIR"/grabs.db";
+   char *settings_db = PACKAGE_DATA_DIR"/settings.db";
    static time_t mod_date_grabs = 0;
    static time_t mod_date_settings = 0;
    time_t mod;

diff --git a/src/desktops.c b/src/desktops.c
index 74dc908..e1fad85 100644 (file)
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -379,11 +379,11 @@ e_desktops_init_file_display(E_Desktop *desk)
        Evas e;
        
        e = desk->evas.desk;
-       o = evas_add_image_from_file(e, "../data/bg.png");
+       o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/bg.png");
        evas_move(e, o, 0, 0);
        evas_resize(e, o, screen_w, screen_h);
        evas_show(e, o);
-       o = evas_add_image_from_file(e, "../data/e_logo.png");
+       o = evas_add_image_from_file(e, PACKAGE_DATA_DIR"/e_logo.png");
        evas_move(e, o, 0, 0);
        evas_show(e, o);
      }