From 0b090bd5647a0e1f15cc0130f6a65c65c644fac4 Mon Sep 17 00:00:00 2001
From: Brian Tarricone <brian@tarricone.org>
Date: Sun, 14 Sep 2008 10:19:53 +0000
Subject: [PATCH] fix some minor nits
(Old svn revision: 27861)
---
settings-dialogs/Makefile.am | 2 ++
settings-dialogs/workspace-settings.c | 23 +++++++++--------------
2 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am
index 14abd009a..738a301b5 100644
--- a/settings-dialogs/Makefile.am
+++ b/settings-dialogs/Makefile.am
@@ -12,6 +12,7 @@ xfwm4_workspace_settings_CFLAGS = \
$(GLIB_CFLAGS) \
$(GLADE_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
$(LIBXFCONF_CFLAGS) \
-DDATADIR=\"$(datadir)\" \
@@ -23,6 +24,7 @@ xfwm4_workspace_settings_LDADD = \
$(GLIB_LIBS) \
$(GLADE_LIBS) \
$(DBUS_GLIB_LIBS) \
+ $(LIBXFCE4UTIL_LIBS) \
$(LIBXFCEGUI4_LIBS) \
$(LIBXFCONF_LIBS)
diff --git a/settings-dialogs/workspace-settings.c b/settings-dialogs/workspace-settings.c
index 88039ee0c..ffc96a2fb 100644
--- a/settings-dialogs/workspace-settings.c
+++ b/settings-dialogs/workspace-settings.c
@@ -22,22 +22,17 @@
#include <glib.h>
-#if defined(GETTEXT_PACKAGE)
-#include <glib/gi18n-lib.h>
-#else
-#include <glib/gi18n.h>
-#endif
-
#include <gtk/gtk.h>
#include <glade/glade.h>
+#include <libxfce4util/libxfce4util.h>
#include <libxfcegui4/libxfcegui4.h>
#include <xfconf/xfconf.h>
#include "xfwm4-workspace-dialog_glade.h"
static gboolean version = FALSE;
-GtkWidget *
+static GtkWidget *
workspace_dialog_new_from_xml (GladeXML *gxml)
{
GtkWidget *dialog;
@@ -63,7 +58,7 @@ workspace_dialog_new_from_xml (GladeXML *gxml)
static GOptionEntry entries[] =
{
- { "version", 'v', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version,
+ { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &version,
N_("Version information"),
NULL
},
@@ -78,11 +73,7 @@ main(int argc, gchar **argv)
GtkWidget *dialog;
GError *cli_error = NULL;
- #ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
- #endif
+ xfce_textdomain (GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
if(!gtk_init_with_args(&argc, &argv, _("."), entries, PACKAGE, &cli_error))
{
@@ -100,7 +91,11 @@ main(int argc, gchar **argv)
return 0;
}
- xfconf_init(NULL);
+ if(!xfconf_init (&cli_error)) {
+ g_critical ("Failed to contact xfconfd: %s", cli_error->message);
+ g_error_free (cli_error);
+ return 1;
+ }
gxml = glade_xml_new_from_buffer (workspace_dialog_glade,
workspace_dialog_glade_length,
--
GitLab