[Goodies-commits] r5839 - xfce4-power-manager/trunk/src
Ali Abdallah
aliov at xfce.org
Mon Oct 27 17:41:52 CET 2008
Author: aliov
Date: 2008-10-27 16:41:52 +0000 (Mon, 27 Oct 2008)
New Revision: 5839
Modified:
xfce4-power-manager/trunk/src/xfpm-common.c
xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
xfce4-power-manager/trunk/src/xfpm-dbus-messages.h
xfce4-power-manager/trunk/src/xfpm-hal.c
xfce4-power-manager/trunk/src/xfpm-main.c
Log:
Added --version command line+translatable description
Modified: xfce4-power-manager/trunk/src/xfpm-common.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-common.c 2008-10-27 16:21:03 UTC (rev 5838)
+++ xfce4-power-manager/trunk/src/xfpm-common.c 2008-10-27 16:41:52 UTC (rev 5839)
@@ -26,10 +26,6 @@
#include "xfpm-common.h"
#include "xfpm-debug.h"
-#ifndef _
-#define _(x) x
-#endif
-
GdkPixbuf *
xfpm_load_icon(const char *icon_name,gint size)
{
Modified: xfce4-power-manager/trunk/src/xfpm-dbus-messages.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-messages.c 2008-10-27 16:21:03 UTC (rev 5838)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-messages.c 2008-10-27 16:41:52 UTC (rev 5839)
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*-
*
- * * Copyright (C) 2008 Ali <ali.slackware at gmail.com>
+ * * Copyright (C) 2008 Ali <aliov at xfce.org>
*
* Licensed under the GNU General Public License Version 2
*
@@ -23,6 +23,8 @@
#include "config.h"
#endif
+#include <libxfce4util/libxfce4util.h>
+
#include "xfpm-dbus-messages.h"
#include "xfpm-debug.h"
@@ -62,7 +64,7 @@
if ( !connection )
{
- g_printerr("Dbus connection error: %s\n",error.message);
+ XFPM_DEBUG("Dbus connection error: %s\n",error.message);
dbus_error_free(&error);
return NULL;
}
@@ -70,7 +72,6 @@
{
return connection;
}
-
}
@@ -82,7 +83,7 @@
signal);
if ( !message )
{
- g_critical("Failed to create dbus message\n");
+ g_critical(_("Failed to create dbus message\n"));
return NULL;
}
else
@@ -118,7 +119,7 @@
dbus_connection_unref(connection);
if ( ret == FALSE )
{
- g_critical("Failed to send message \n");
+ g_critical(_("Failed to send message\n"));
return FALSE;
} else
{
Modified: xfce4-power-manager/trunk/src/xfpm-dbus-messages.h
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-dbus-messages.h 2008-10-27 16:21:03 UTC (rev 5838)
+++ xfce4-power-manager/trunk/src/xfpm-dbus-messages.h 2008-10-27 16:41:52 UTC (rev 5839)
@@ -1,6 +1,6 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*-
*
- * * Copyright (C) 2008 Ali <ali.slackware at gmail.com>
+ * * Copyright (C) 2008 Ali <aliov at xfce.org>
*
* Licensed under the GNU General Public License Version 2
*
Modified: xfce4-power-manager/trunk/src/xfpm-hal.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-hal.c 2008-10-27 16:21:03 UTC (rev 5838)
+++ xfce4-power-manager/trunk/src/xfpm-hal.c 2008-10-27 16:41:52 UTC (rev 5839)
@@ -159,7 +159,7 @@
// If this happens then nobody cares
if ( !xfpm_hal_monitor(xfpm_hal) )
{
- g_printerr("Error monitoring HAL events\n");
+ g_printerr(_("Error monitoring HAL events\n"));
priv->connected = FALSE;
}
else
@@ -247,13 +247,13 @@
if ( !priv->connection || dbus_error_is_set(&error) )
{
- g_critical("Unable to connect to DBus %s\n",error.message);
+ g_critical(_("Unable to connect to DBus %s\n"),error.message);
return FALSE;
}
if ( !xfpm_dbus_name_has_owner(priv->connection,HAL_DBUS_SERVICE) )
{
- g_critical("HAL is not running or not responding\n");
+ g_critical(_("HAL is not running or not responding\n"));
return FALSE;
}
priv->ctx = libhal_ctx_new();
@@ -264,7 +264,7 @@
libhal_ctx_init(priv->ctx,&error);
if ( dbus_error_is_set(&error) ) {
- g_printerr("Unable to connect to DBus %s\n",error.message);
+ g_printerr(_("Unable to connect to DBus %s\n"),error.message);
return FALSE;
}
@@ -398,7 +398,7 @@
libhal_device_property_watch_all(priv->ctx,&error);
if ( dbus_error_is_set(&error) ) {
- g_printerr("Unable to watch device using HAL %s\n",error.message);
+ g_printerr(_("Unable to watch device using HAL %s\n"),error.message);
return FALSE;
}
Modified: xfce4-power-manager/trunk/src/xfpm-main.c
===================================================================
--- xfce4-power-manager/trunk/src/xfpm-main.c 2008-10-27 16:21:03 UTC (rev 5838)
+++ xfce4-power-manager/trunk/src/xfpm-main.c 2008-10-27 16:41:52 UTC (rev 5839)
@@ -62,16 +62,23 @@
static void
show_usage()
{
-
- printf( "\n"
- "Usage: xfce_power_manager [options] \n"
+ setlocale(LC_ALL,"");
+ g_print (_("\n"
+ "Xfce Power Manager %s\n\n"
+ "Part of the Xfce Goodies Project\n"
+ "http://goodies.xfce.org\n\n"
+ "Licensed under the GNU GPL.\n\n"), VERSION);
+
+ /* Only the description is translatable */
+ g_print(_( "\n"
+ "Usage: xfce-power-manager [options] \n"
"\n"
"Options:\n"
"-h, --help Print this help message\n"
"-r, --run Start xfce power manager\n"
"-c, --customize Show Configuration dialog\n"
"-q, --quit Quit any running xfce power manager\n"
- "\n");
+ "\n"));
}
@@ -155,7 +162,9 @@
if ( argc > 1 && argv[1][0] == '-' )
{
- if (!strcmp(argv[1],"-h") ||
+ if (!strcmp(argv[1], "-v") ||
+ !strcmp(argv[1], "-version")||
+ !strcmp(argv[1],"-h") ||
!strcmp(argv[1],"--help"))
{
show_usage();
@@ -213,7 +222,7 @@
}
if ( reply != 1 )
{
- g_print("Xfce power manager is not running\n");
+ g_print(_("Xfce power manager is not running\n"));
gboolean ret =
xfce_confirm(_("Xfce4 Power Manager is not running, do you want to launch it now ?"),
GTK_STOCK_YES,
@@ -238,7 +247,7 @@
if ( reply == 0 )
{
- g_print("Xfce power manager is not running\n");
+ g_print(_("Xfce power manager is not running\n"));
return 0;
}
return 0;
@@ -254,7 +263,7 @@
if ( reply == 1 )
{
- g_print("Xfce power manager is already running\n");
+ g_print(_("Xfce power manager is already running\n"));
return 0;
}
XfpmDriver *driver = xfpm_driver_new();
@@ -267,7 +276,7 @@
"make sure the hardware abstract layer and the message bus daemon "\
"are running"),
GTK_MESSAGE_ERROR);
- g_error("Unable to load xfce4 power manager driver\n");
+ g_error(_("Unable to load xfce4 power manager\n"));
g_object_unref(driver);
return 1;
}
More information about the Goodies-commits
mailing list