Author: akv
Date: 2011-03-20 21:54:22 +0100 (Sun, 20 Mar 2011)
New Revision: 3904
Modified:
trunk/librawstudio/rs-profile-camera.c
trunk/librawstudio/rs-profile-factory.c
trunk/librawstudio/rs-stock.c
trunk/librawstudio/rs-utils.c
trunk/plugins/colorspace-adobergb/colorspace-adobergb.c
trunk/plugins/colorspace-prophoto/colorspace-prophoto.c
trunk/plugins/colorspace-srgb/colorspace-srgb.c
trunk/plugins/output-facebook/output-facebook.c
trunk/plugins/output-flickr/output-flickr.c
trunk/plugins/output-picasa/output-picasa.c
trunk/src/application.c
trunk/src/gtk-helper.c
trunk/src/gtk-interface.c
trunk/src/rs-batch.c
trunk/src/rs-camera-db.c
trunk/src/rs-store.c
Log:
Made a lot of strings generic.
Modified: trunk/librawstudio/rs-profile-camera.c
===================================================================
--- trunk/librawstudio/rs-profile-camera.c 2011-03-20 20:31:32 UTC (rev
3903)
+++ trunk/librawstudio/rs-profile-camera.c 2011-03-20 20:54:22 UTC (rev
3904)
@@ -55,7 +55,7 @@
xmlChar *xml_unique_id, *xml_make, *xml_model;
if (!filename)
- filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
"profiles/rawstudio-cameras.xml", NULL);
+ filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
"profiles" G_DIR_SEPARATOR_S "rawstudio-cameras.xml", NULL);
if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR))
return NULL;
Modified: trunk/librawstudio/rs-profile-factory.c
===================================================================
--- trunk/librawstudio/rs-profile-factory.c 2011-03-20 20:31:32 UTC (rev
3903)
+++ trunk/librawstudio/rs-profile-factory.c 2011-03-20 20:54:22 UTC (rev
3904)
@@ -23,7 +23,7 @@
#include "config.h"
#include "rs-utils.h"
-#define PROFILE_FACTORY_DEFAULT_SEARCH_PATH PACKAGE_DATA_DIR "/" PACKAGE
"/profiles/"
+#define PROFILE_FACTORY_DEFAULT_SEARCH_PATH PACKAGE_DATA_DIR G_DIR_SEPARATOR_S
PACKAGE G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S
G_DEFINE_TYPE(RSProfileFactory, rs_profile_factory, G_TYPE_OBJECT)
Modified: trunk/librawstudio/rs-stock.c
===================================================================
--- trunk/librawstudio/rs-stock.c 2011-03-20 20:31:32 UTC (rev 3903)
+++ trunk/librawstudio/rs-stock.c 2011-03-20 20:54:22 UTC (rev 3904)
@@ -74,13 +74,13 @@
{
rs_icon_factory = gtk_icon_factory_new ();
- add_stock_icon (RS_STOCK_CROP,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/tool-crop.png",
NULL));
- add_stock_icon (RS_STOCK_ROTATE,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/tool-rotate.png", NULL));
- add_stock_icon (RS_STOCK_COLOR_PICKER,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/tool-color-picker.png", NULL));
- add_stock_icon (RS_STOCK_ROTATE_CLOCKWISE,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_90.png", NULL));
- add_stock_icon (RS_STOCK_ROTATE_COUNTER_CLOCKWISE,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_270.png", NULL));
- add_stock_icon (RS_STOCK_FLIP,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_flip.png", NULL));
- add_stock_icon (RS_STOCK_MIRROR,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_mirror.png", NULL));
+ add_stock_icon (RS_STOCK_CROP,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "tool-crop.png", NULL));
+ add_stock_icon (RS_STOCK_ROTATE,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "tool-rotate.png", NULL));
+ add_stock_icon (RS_STOCK_COLOR_PICKER,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "tool-color-picker.png", NULL));
+ add_stock_icon (RS_STOCK_ROTATE_CLOCKWISE,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_90.png", NULL));
+ add_stock_icon (RS_STOCK_ROTATE_COUNTER_CLOCKWISE,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_270.png", NULL));
+ add_stock_icon (RS_STOCK_FLIP,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_flip.png", NULL));
+ add_stock_icon (RS_STOCK_MIRROR,
gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_mirror.png", NULL));
gtk_icon_factory_add_default (rs_icon_factory);
@@ -93,7 +93,7 @@
RSCursorItem *cursor = &rs_cursor_items[cursor_type];
GdkPixbuf *pixbuf = NULL;
- pixbuf = gdk_pixbuf_new_from_file(g_build_filename (PACKAGE_DATA_DIR
"/pixmaps/" PACKAGE, cursor->filename, NULL), NULL);
+ pixbuf = gdk_pixbuf_new_from_file(g_build_filename (PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE, cursor->filename, NULL),
NULL);
return gdk_cursor_new_from_pixbuf(display, pixbuf,
cursor->x_hot,cursor->y_hot);
}
Modified: trunk/librawstudio/rs-utils.c
===================================================================
--- trunk/librawstudio/rs-utils.c 2011-03-20 20:31:32 UTC (rev 3903)
+++ trunk/librawstudio/rs-utils.c 2011-03-20 20:54:22 UTC (rev 3904)
@@ -603,27 +603,27 @@
check_install()
{
#define TEST_FILE_ACCESS(path) do { if (g_access(path, R_OK)!=0)
g_debug("Cannot access %s\n", path);} while (0)
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/icons/" PACKAGE ".png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/overlay_priority1.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/overlay_priority2.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/overlay_priority3.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/overlay_deleted.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/overlay_exported.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_flip.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_mirror.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_90.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_180.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/transform_270.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/cursor-color-picker.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/cursor-crop.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/cursor-rotate.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/tool-color-picker.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE "/tool-crop.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/pixmaps/" PACKAGE
"/tool-rotate.png");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/" PACKAGE "/ui.xml");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/" PACKAGE "/rawstudio.gtkrc");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/" PACKAGE
"/profiles/generic_camera_profile.icc");
- TEST_FILE_ACCESS(PACKAGE_DATA_DIR "/" PACKAGE "/profiles/sRGB.icc");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "icons"
G_DIR_SEPARATOR_S PACKAGE ".png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority1.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority2.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_priority3.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_deleted.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "overlay_exported.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_flip.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_mirror.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_90.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_180.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "transform_270.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "cursor-color-picker.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "cursor-crop.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "cursor-rotate.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "tool-color-picker.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "tool-crop.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "pixmaps"
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "tool-rotate.png");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE
G_DIR_SEPARATOR_S "ui.xml");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE
G_DIR_SEPARATOR_S "rawstudio.gtkrc");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE
G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S "generic_camera_profile.icc");
+ TEST_FILE_ACCESS(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE
G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S "sRGB.icc");
#undef TEST_FILE_ACCESS
}
Modified: trunk/plugins/colorspace-adobergb/colorspace-adobergb.c
===================================================================
--- trunk/plugins/colorspace-adobergb/colorspace-adobergb.c 2011-03-20
20:31:32 UTC (rev 3903)
+++ trunk/plugins/colorspace-adobergb/colorspace-adobergb.c 2011-03-20
20:54:22 UTC (rev 3904)
@@ -62,8 +62,8 @@
colorclass->description = _("Print friendly color space, compatible
with Adobe RGB (1998)");
colorclass->get_gamma_function = get_gamma_function;
- klass->icc_profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/"
PACKAGE "/profiles/compatibleWithAdobeRGB1998.icc");
- klass->icc_profile_linear =
rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/" PACKAGE
"/profiles/compatibleWithAdobeRGB1998-linear.icc");
+ klass->icc_profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S
"compatibleWithAdobeRGB1998.icc");
+ klass->icc_profile_linear =
rs_icc_profile_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE
G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S
"compatibleWithAdobeRGB1998-linear.icc");
}
static void
Modified: trunk/plugins/colorspace-prophoto/colorspace-prophoto.c
===================================================================
--- trunk/plugins/colorspace-prophoto/colorspace-prophoto.c 2011-03-20
20:31:32 UTC (rev 3903)
+++ trunk/plugins/colorspace-prophoto/colorspace-prophoto.c 2011-03-20
20:54:22 UTC (rev 3904)
@@ -62,8 +62,8 @@
colorclass->description = _("Large gamut color space");
colorclass->get_gamma_function = get_gamma_function;
- klass->icc_profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/"
PACKAGE "/profiles/prophoto.icc");
- klass->icc_profile_linear =
rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/" PACKAGE
"/profiles/prophoto-linear.icc");
+ klass->icc_profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S
"prophoto.icc");
+ klass->icc_profile_linear =
rs_icc_profile_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE
G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S "prophoto-linear.icc");
}
static void
Modified: trunk/plugins/colorspace-srgb/colorspace-srgb.c
===================================================================
--- trunk/plugins/colorspace-srgb/colorspace-srgb.c 2011-03-20 20:31:32 UTC
(rev 3903)
+++ trunk/plugins/colorspace-srgb/colorspace-srgb.c 2011-03-20 20:54:22 UTC
(rev 3904)
@@ -63,8 +63,8 @@
colorclass->get_icc_profile = get_icc_profile;
colorclass->get_gamma_function = get_gamma_function;
- klass->icc_profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/"
PACKAGE "/profiles/sRGB.icc");
- klass->icc_profile_linear =
rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/" PACKAGE
"/profiles/sRGB-linear.icc");
+ klass->icc_profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S
"sRGB.icc");
+ klass->icc_profile_linear =
rs_icc_profile_new_from_file(PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE
G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S "sRGB-linear.icc");
}
static void
Modified: trunk/plugins/output-facebook/output-facebook.c
===================================================================
--- trunk/plugins/output-facebook/output-facebook.c 2011-03-20 20:31:32 UTC
(rev 3903)
+++ trunk/plugins/output-facebook/output-facebook.c 2011-03-20 20:54:22 UTC
(rev 3904)
@@ -490,7 +490,7 @@
GtkWidget *
get_logo_widget(RSFacebook *facebook)
{
- gchar *filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
"/plugins/facebook-logo.svg", NULL);
+ gchar *filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
G_DIR_SEPARATOR_S "plugins" G_DIR_SEPARATOR_S "facebook-logo.svg", NULL);
GtkWidget *box = gtk_vbox_new(TRUE, 2);
GtkWidget *logo = gtk_image_new_from_file(filename);
g_free(filename);
Modified: trunk/plugins/output-flickr/output-flickr.c
===================================================================
--- trunk/plugins/output-flickr/output-flickr.c 2011-03-20 20:31:32 UTC (rev
3903)
+++ trunk/plugins/output-flickr/output-flickr.c 2011-03-20 20:54:22 UTC (rev
3904)
@@ -466,7 +466,7 @@
static GtkWidget *
get_logo_widget(RSFlickr *flickr)
{
- gchar *filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
"/plugins/flickr-logo.svg", NULL);
+ gchar *filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
G_DIR_SEPARATOR_S "plugins" G_DIR_SEPARATOR_S "flickr-logo.svg", NULL);
GtkWidget *box = gtk_vbox_new(TRUE, 2);
GtkWidget *logo = gtk_image_new_from_file(filename);
g_free(filename);
Modified: trunk/plugins/output-picasa/output-picasa.c
===================================================================
--- trunk/plugins/output-picasa/output-picasa.c 2011-03-20 20:31:32 UTC (rev
3903)
+++ trunk/plugins/output-picasa/output-picasa.c 2011-03-20 20:54:22 UTC (rev
3904)
@@ -437,7 +437,7 @@
static GtkWidget *
get_picasa_logo_widget(RSPicasa *picasa)
{
- gchar *filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
"/plugins/picasa-logo.svg", NULL);
+ gchar *filename = g_build_filename(PACKAGE_DATA_DIR, PACKAGE,
G_DIR_SEPARATOR_S "plugins" G_DIR_SEPARATOR_S "picasa-logo.svg", NULL);
GtkWidget *box = gtk_vbox_new(TRUE, 2);
GtkWidget *logo = gtk_image_new_from_file(filename);
g_free(filename);
Modified: trunk/src/application.c
===================================================================
--- trunk/src/application.c 2011-03-20 20:31:32 UTC (rev 3903)
+++ trunk/src/application.c 2011-03-20 20:54:22 UTC (rev 3904)
@@ -339,7 +339,7 @@
lf_db_load (lensdb);
RSProfileFactory *profile_factory =
g_object_new(RS_TYPE_PROFILE_FACTORY, NULL);
- rs_profile_factory_load_profiles(profile_factory, PACKAGE_DATA_DIR "/"
PACKAGE "/profiles/", TRUE, FALSE);
+ rs_profile_factory_load_profiles(profile_factory, PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S, TRUE,
FALSE);
printf("basename, load, filetype, thumb, meta, make, a-make, a-model,
aperture, iso, s-speed, wb, f-length, lensfun camera, lens min focal, lens max
focal, lens max aperture, lens min aperture, lens id, lens identifier, dcp
profile\n");
status = g_io_channel_read_line(io, &filename, NULL, NULL, NULL);
Modified: trunk/src/gtk-helper.c
===================================================================
--- trunk/src/gtk-helper.c 2011-03-20 20:31:32 UTC (rev 3903)
+++ trunk/src/gtk-helper.c 2011-03-20 20:54:22 UTC (rev 3904)
@@ -527,7 +527,7 @@
gtk_rc_set_default_files(default_rc_files);
break;
case RAWSTUDIO_THEME:
- gtk_rc_add_default_file(PACKAGE_DATA_DIR "/"
PACKAGE "/rawstudio.gtkrc");
+ gtk_rc_add_default_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "rawstudio.gtkrc");
break;
}
current_theme = theme;
Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c 2011-03-20 20:31:32 UTC (rev 3903)
+++ trunk/src/gtk-interface.c 2011-03-20 20:54:22 UTC (rev 3904)
@@ -1047,7 +1047,7 @@
{
GError *error = NULL;
ui_manager = gtk_ui_manager_new ();
- gtk_ui_manager_add_ui_from_file (ui_manager, PACKAGE_DATA_DIR
"/" PACKAGE "/ui.xml", &error);
+ gtk_ui_manager_add_ui_from_file (ui_manager, PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "ui.xml", &error);
if (error)
{
g_message ("Building menus failed: %s", error->message);
@@ -1391,7 +1391,7 @@
GtkWidget *valuefield[3];
- gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR "/icons/"
PACKAGE ".png", NULL);
+ gtk_window_set_default_icon_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
rs->window = gui_window_make(rs);
gtk_widget_show(rs->window);
Modified: trunk/src/rs-batch.c
===================================================================
--- trunk/src/rs-batch.c 2011-03-20 20:31:32 UTC (rev 3903)
+++ trunk/src/rs-batch.c 2011-03-20 20:54:22 UTC (rev 3904)
@@ -431,7 +431,7 @@
g_free(profile_filename);
}
/*if (!profile)
- profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR "/"
PACKAGE "/profiles/generic_camera_profile.icc");*/
+ profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S
"generic_camera_profile.icc");*/
g_object_set(finput, "icc-profile", profile, NULL);
g_object_unref(profile);
@@ -443,7 +443,7 @@
g_free(profile_filename);
}
if (!profile)
- profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR
"/" PACKAGE "/profiles/sRGB.icc");
+ profile = rs_icc_profile_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "profiles" G_DIR_SEPARATOR_S
"sRGB.icc");
g_object_set(fend, "icc-profile", profile, NULL);
g_object_unref(profile);
}
Modified: trunk/src/rs-camera-db.c
===================================================================
--- trunk/src/rs-camera-db.c 2011-03-20 20:31:32 UTC (rev 3903)
+++ trunk/src/rs-camera-db.c 2011-03-20 20:54:22 UTC (rev 3904)
@@ -419,7 +419,7 @@
static GdkPixbuf *pixbuf = NULL;
if (!pixbuf)
- pixbuf = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR "/pixmaps/"
PACKAGE "/camera-photo.png", NULL);
+ pixbuf = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"camera-photo.png", NULL);
g_object_set(cell, "pixbuf", pixbuf, NULL);
}
Modified: trunk/src/rs-store.c
===================================================================
--- trunk/src/rs-store.c 2011-03-20 20:31:32 UTC (rev 3903)
+++ trunk/src/rs-store.c 2011-03-20 20:54:22 UTC (rev 3904)
@@ -207,11 +207,11 @@
G_TYPE_POINTER);
if (!icon_priority_1)
{
- icon_priority_1 = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
"/pixmaps/" PACKAGE "/overlay_priority1.png", NULL);
- icon_priority_2 = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
"/pixmaps/" PACKAGE "/overlay_priority2.png", NULL);
- icon_priority_3 = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
"/pixmaps/" PACKAGE "/overlay_priority3.png", NULL);
- icon_priority_D = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
"/pixmaps/" PACKAGE "/overlay_deleted.png", NULL);
- icon_exported = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
"/pixmaps/" PACKAGE "/overlay_exported.png", NULL);
+ icon_priority_1 = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_priority1.png", NULL);
+ icon_priority_2 = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_priority2.png", NULL);
+ icon_priority_3 = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_priority3.png", NULL);
+ icon_priority_D = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_deleted.png", NULL);
+ icon_exported = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "pixmaps" G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S
"overlay_exported.png", NULL);
}
}
@@ -1174,7 +1174,7 @@
/* Global default icon */
if (!icon_default)
- icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
"/icons/" PACKAGE ".png", NULL);
+ icon_default = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
G_DIR_SEPARATOR_S "icons" G_DIR_SEPARATOR_S PACKAGE ".png", NULL);
/* Add file to store */
gdk_threads_enter();
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
