Added GNOME_PROGRAM_STANDARD_PROPERTIES.

Removed configuration artifacts from 0.4.x.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@84 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/commands.c b/glabels2/src/commands.c
index 91793985a8b17fcaf11d98b1677cf7f87182aa5d..9e59fa78eb7458de669fdb73430219dd1354cfe7 100644 (file)
--- a/glabels2/src/commands.c
+++ b/glabels2/src/commands.c
@@ -36,11 +36,10 @@
 #include "prefs-dialog.h"
 #include "debug.h"
 
-#ifdef PACKAGE_DATA_DIR
-#define LOGO_PIXMAP (PACKAGE_DATA_DIR "/pixmaps/glabels/glabels-about-logo.png")
-#else
-#define LOGO_PIXMAP gnome_pixmap_file("glabels/glabels-about-logo.png")
-#endif
+#define LOGO_PIXMAP gnome_program_locate_file (NULL,\
+                                        GNOME_FILE_DOMAIN_APP_PIXMAP,\
+                                        "glabels/glabels-about-logo.png",\
+                                        FALSE, NULL)
 
 \f
 /****************************************************************************/

diff --git a/glabels2/src/glabels-batch.c b/glabels2/src/glabels-batch.c
index 68bfaf8d8e312dfdc506a7f613bc582b1d5a8f56..dca54f6131bd4b8b76c2774bf74afb0b9e8dcebc 100644 (file)
--- a/glabels2/src/glabels-batch.c
+++ b/glabels2/src/glabels-batch.c
@@ -66,8 +66,7 @@ static struct poptOption options[] = {
 /* Main                                                                      */
 /*****************************************************************************/
 int
-main (int argc,
-      char *argv[])
+main (int argc, char **argv)
 {
        poptContext pctx;
        gchar **args;
@@ -80,8 +79,8 @@ main (int argc,
        glLabel *label = NULL;
        glXMLLabelStatus status;
 
-       bindtextdomain (PACKAGE, PACKAGE_LOCALE_DIR);
-       textdomain (PACKAGE);
+       bindtextdomain (GETTEXT_PACKAGE, GLABELS_LOCALEDIR);
+       textdomain (GETTEXT_PACKAGE);
 
        gtk_type_init ();
 

diff --git a/glabels2/src/glabels.c b/glabels2/src/glabels.c
index c402fc61ea149932d78d09e0d25803ae1941a575..7687fb84c6d79de4436fe551c2fef5db4e66878a 100644 (file)
--- a/glabels2/src/glabels.c
+++ b/glabels2/src/glabels.c
@@ -43,11 +43,10 @@
 #include "file.h"
 #include "debug.h"
 
-#ifdef PACKAGE_DATA_DIR
-#define ICON_PIXMAP (PACKAGE_DATA_DIR "/pixmaps/glabels/glabels-icon.png")
-#else
-#define ICON_PIXMAP gnome_pixmap_file("glabels/glabels-icon.png")
-#endif
+#define ICON_PIXMAP gnome_program_locate_file (NULL,\
+                                              GNOME_FILE_DOMAIN_APP_PIXMAP,\
+                                              "glabels/glabels-icon.png",\
+                                              FALSE, NULL)
 
 glMDI *glabels_mdi = NULL;
 gboolean glabels_close_x_button_pressed = FALSE;
@@ -126,9 +125,10 @@ main (int argc, char **argv)
 
        /* Initialize gnome program */
        program = gnome_program_init ("glabels", VERSION,
-                           LIBGNOMEUI_MODULE, argc, argv,
-                           GNOME_PARAM_POPT_TABLE, options,
-                           NULL);
+                                     LIBGNOMEUI_MODULE, argc, argv,
+                                     GNOME_PROGRAM_STANDARD_PROPERTIES,
+                                     GNOME_PARAM_POPT_TABLE, options,
+                                     NULL);
 
        /* Splash screen */
        gl_splash ();

diff --git a/glabels2/src/splash.c b/glabels2/src/splash.c
index 1812455c118d58116b5fff46b18d4f10dea25820..62be7ee64b02aa2416c3e1e4361f90f127788bb2 100644 (file)
--- a/glabels2/src/splash.c
+++ b/glabels2/src/splash.c
@@ -29,11 +29,10 @@
 
 #include "debug.h"
 
-#ifdef PACKAGE_DATA_DIR
-#define SPLASH_PIXMAP (PACKAGE_DATA_DIR "/pixmaps/glabels/glabels-logo.png")
-#else
-#define SPLASH_PIXMAP gnome_pixmap_file("glabels/glabels-logo.png")
-#endif
+#define SPLASH_PIXMAP gnome_program_locate_file (NULL,\
+                                                GNOME_FILE_DOMAIN_APP_PIXMAP,\
+                                                "glabels/glabels-logo.png",\
+                                                FALSE, NULL)
 
 #define SPLASH_TIMEOUT 2000
 

diff --git a/glabels2/src/template.c b/glabels2/src/template.c
index 55627866a27403637cc1561858f2e50e45ece5fd..ef568edb279755e8281cb00e159ac3ed77ffc768 100644 (file)
--- a/glabels2/src/template.c
+++ b/glabels2/src/template.c
@@ -29,11 +29,10 @@
 
 #include "debug.h"
 
-#ifdef PACKAGE_DATA_DIR
-#define GL_DATA_DIR (PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "glabels")
-#else
-#define GL_DATA_DIR gnome_datadir_file("glabels")
-#endif
+#define GL_DATA_DIR gnome_program_locate_file (NULL,\
+                                        GNOME_FILE_DOMAIN_APP_DATADIR,\
+                                        "glabels",\
+                                        FALSE, NULL)
 
 #define FULL_PAGE "Full-page"