[Goodies-commits] r7517 - in xfmpc/trunk: . src
Mike Massonnet
mmassonnet at xfce.org
Tue Jun 9 22:38:34 CEST 2009
Author: mmassonnet
Date: 2009-06-09 20:38:34 +0000 (Tue, 09 Jun 2009)
New Revision: 7517
Modified:
xfmpc/trunk/autogen.sh
xfmpc/trunk/src/Makefile.am
xfmpc/trunk/src/dbbrowser.c
xfmpc/trunk/src/dbbrowser.vala
xfmpc/trunk/src/extended-interface.c
xfmpc/trunk/src/extended-interface.vala
xfmpc/trunk/src/interface.c
xfmpc/trunk/src/interface.vala
xfmpc/trunk/src/main-window.c
xfmpc/trunk/src/main-window.vala
xfmpc/trunk/src/playlist.c
xfmpc/trunk/src/playlist.vala
xfmpc/trunk/src/preferences-dialog.c
xfmpc/trunk/src/preferences-dialog.vala
xfmpc/trunk/src/song-dialog.c
xfmpc/trunk/src/song-dialog.vala
Log:
Fix build problem for Gettext
Dropped useless calls to Xfce.textdomain(). It is only necessary once in the
main function. This worked around a problem to compile the program where
GETTEXT_PACKAGE is not declared before gi18n-lib.h is included. The fix in this
commit is to current it in Makefile.am in the INCLUDES.
Changed default debug level to yes instead of full in autogen.sh.
Modified: xfmpc/trunk/autogen.sh
===================================================================
--- xfmpc/trunk/autogen.sh 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/autogen.sh 2009-06-09 20:38:34 UTC (rev 7517)
@@ -41,6 +41,6 @@
-e "s/@REVISION@/${revision}/g" \
< "configure.in.in" > "configure.in"
-exec xdt-autogen --enable-debug=full $@
+exec xdt-autogen --enable-debug=yes $@
rm "configure.in"
Modified: xfmpc/trunk/src/Makefile.am
===================================================================
--- xfmpc/trunk/src/Makefile.am 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/Makefile.am 2009-06-09 20:38:34 UTC (rev 7517)
@@ -11,7 +11,8 @@
playlist.vala
vala_built_SOURCES = \
- $(xfmpc_VALASOURCES:.vala=.c)
+ $(xfmpc_VALASOURCES:.vala=.c) \
+ $(xfmpc_VALASOURCES:.vala=.h)
if MAINTAINER_MODE
@@ -44,9 +45,7 @@
@GTK_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
- @LIBMPD_CFLAGS@ \
- -DDATADIR=\"$(datadir)\" \
- -DSRCDIR=\"$(top_srcdir)\"
+ @LIBMPD_CFLAGS@
xfmpc_LDADD = \
@GTK_LIBS@ \
@@ -56,8 +55,11 @@
INCLUDES = \
-I${top_srcdir} \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- -DLOCALEDIR=\"$(localedir)\"
+ -DGETTEXT_PACKAGE=\""$(GETTEXT_PACKAGE)"\" \
+ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
+ -DLOCALEDIR=\""$(localedir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DSRCDIR=\""$(top_srcdir)"\"
EXTRA_DIST = \
main-ui.xml \
Modified: xfmpc/trunk/src/dbbrowser.c
===================================================================
--- xfmpc/trunk/src/dbbrowser.c 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/dbbrowser.c 2009-06-09 20:38:34 UTC (rev 7517)
@@ -24,11 +24,9 @@
#include <preferences.h>
#include <stdlib.h>
#include <string.h>
-#include <config.h>
#include <gdk-pixbuf/gdk-pixdata.h>
#include <pango/pango.h>
#include <gdk/gdk.h>
-#include <libxfce4util/libxfce4util.h>
#include <glib/gi18n-lib.h>
@@ -57,8 +55,6 @@
struct _XfmpcDbbrowserPrivate {
XfmpcMpdclient* mpdclient;
XfmpcPreferences* preferences;
- char* gettext_package;
- char* localedir;
GtkListStore* store;
GtkTreeView* treeview;
GtkMenu* menu;
@@ -802,7 +798,6 @@
GtkImageMenuItem* _tmp7_;
GtkImage* _tmp8_;
GtkEntry* _tmp9_;
- xfce_textdomain (self->priv->gettext_package, self->priv->localedir, "UTF-8");
self->priv->mpdclient = xfmpc_mpdclient_get ();
self->priv->preferences = xfmpc_preferences_get ();
_tmp1_ = NULL;
@@ -885,16 +880,12 @@
static void xfmpc_dbbrowser_instance_init (XfmpcDbbrowser * self) {
self->priv = XFMPC_DBBROWSER_GET_PRIVATE (self);
- self->priv->gettext_package = g_strdup (GETTEXT_PACKAGE);
- self->priv->localedir = g_strdup (PACKAGE_LOCALE_DIR);
}
static void xfmpc_dbbrowser_finalize (GObject* obj) {
XfmpcDbbrowser * self;
self = XFMPC_DBBROWSER (obj);
- self->priv->gettext_package = (g_free (self->priv->gettext_package), NULL);
- self->priv->localedir = (g_free (self->priv->localedir), NULL);
(self->priv->store == NULL) ? NULL : (self->priv->store = (g_object_unref (self->priv->store), NULL));
(self->priv->treeview == NULL) ? NULL : (self->priv->treeview = (g_object_unref (self->priv->treeview), NULL));
(self->priv->menu == NULL) ? NULL : (self->priv->menu = (g_object_unref (self->priv->menu), NULL));
Modified: xfmpc/trunk/src/dbbrowser.vala
===================================================================
--- xfmpc/trunk/src/dbbrowser.vala 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/dbbrowser.vala 2009-06-09 20:38:34 UTC (rev 7517)
@@ -26,9 +26,6 @@
private unowned Xfmpc.Mpdclient mpdclient;
private unowned Xfmpc.Preferences preferences;
- private string gettext_package = Config.GETTEXT_PACKAGE;
- private string localedir = Config.PACKAGE_LOCALE_DIR;
-
private ListStore store;
private TreeView treeview;
private Menu menu;
@@ -52,8 +49,6 @@
}
construct {
- Xfce.textdomain (gettext_package, localedir, "UTF-8");
-
mpdclient = Xfmpc.Mpdclient.get ();
preferences = Xfmpc.Preferences.get ();
Modified: xfmpc/trunk/src/extended-interface.c
===================================================================
--- xfmpc/trunk/src/extended-interface.c 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/extended-interface.c 2009-06-09 20:38:34 UTC (rev 7517)
@@ -24,11 +24,11 @@
#include <preferences.h>
#include <stdlib.h>
#include <string.h>
-#include <config.h>
#include <gdk/gdk.h>
#include <glib/gi18n-lib.h>
#include <libxfcegui4/libxfcegui4.h>
#include <libxfce4util/libxfce4util.h>
+#include <config.h>
#include <xfce-arrow-button.h>
@@ -89,8 +89,6 @@
struct _XfmpcExtendedInterfacePrivate {
XfmpcMpdclient* mpdclient;
XfmpcPreferences* preferences;
- char* gettext_package;
- char* localedir;
GtkListStore* list_store;
GtkComboBox* combobox;
GtkNotebook* notebook;
@@ -468,7 +466,6 @@
GtkNotebook* _tmp5_;
GtkWidget* playlist;
GtkWidget* dbbrowser;
- xfce_textdomain (self->priv->gettext_package, self->priv->localedir, "UTF-8");
self->priv->mpdclient = xfmpc_mpdclient_get ();
self->priv->preferences = xfmpc_preferences_get ();
hbox = g_object_ref_sink ((GtkHBox*) gtk_hbox_new (FALSE, 2));
@@ -533,16 +530,12 @@
static void xfmpc_extended_interface_instance_init (XfmpcExtendedInterface * self) {
self->priv = XFMPC_EXTENDED_INTERFACE_GET_PRIVATE (self);
- self->priv->gettext_package = g_strdup (GETTEXT_PACKAGE);
- self->priv->localedir = g_strdup (PACKAGE_LOCALE_DIR);
}
static void xfmpc_extended_interface_finalize (GObject* obj) {
XfmpcExtendedInterface * self;
self = XFMPC_EXTENDED_INTERFACE (obj);
- self->priv->gettext_package = (g_free (self->priv->gettext_package), NULL);
- self->priv->localedir = (g_free (self->priv->localedir), NULL);
(self->priv->list_store == NULL) ? NULL : (self->priv->list_store = (g_object_unref (self->priv->list_store), NULL));
(self->priv->combobox == NULL) ? NULL : (self->priv->combobox = (g_object_unref (self->priv->combobox), NULL));
(self->priv->notebook == NULL) ? NULL : (self->priv->notebook = (g_object_unref (self->priv->notebook), NULL));
Modified: xfmpc/trunk/src/extended-interface.vala
===================================================================
--- xfmpc/trunk/src/extended-interface.vala 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/extended-interface.vala 2009-06-09 20:38:34 UTC (rev 7517)
@@ -26,9 +26,6 @@
private unowned Xfmpc.Mpdclient mpdclient;
private unowned Xfmpc.Preferences preferences;
- private string gettext_package = Config.GETTEXT_PACKAGE;
- private string localedir = Config.PACKAGE_LOCALE_DIR;
-
private static Xfce.ArrowButton context_button;
private ListStore list_store;
private ComboBox combobox;
@@ -47,8 +44,6 @@
}
construct {
- Xfce.textdomain (gettext_package, localedir, "UTF-8");
-
mpdclient = Xfmpc.Mpdclient.get ();
preferences = Xfmpc.Preferences.get ();
Modified: xfmpc/trunk/src/interface.c
===================================================================
--- xfmpc/trunk/src/interface.c 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/interface.c 2009-06-09 20:38:34 UTC (rev 7517)
@@ -24,12 +24,11 @@
#include <preferences.h>
#include <stdlib.h>
#include <string.h>
-#include <config.h>
#include <gdk/gdk.h>
#include <float.h>
#include <math.h>
#include <glib/gi18n-lib.h>
-#include <libxfce4util/libxfce4util.h>
+#include <config.h>
#include <pango/pango.h>
@@ -56,8 +55,6 @@
struct _XfmpcInterfacePrivate {
XfmpcMpdclient* mpdclient;
XfmpcPreferences* preferences;
- char* gettext_package;
- char* localedir;
GtkButton* button_prev;
GtkButton* button_pp;
GtkButton* button_next;
@@ -233,7 +230,7 @@
static gboolean xfmpc_interface_refresh (XfmpcInterface* self) {
g_return_val_if_fail (self != NULL, FALSE);
if (xfmpc_mpdclient_connect (self->priv->mpdclient) == FALSE) {
- g_warning ("interface.vala:213: Failed to connect to MPD");
+ g_warning ("interface.vala:208: Failed to connect to MPD");
xfmpc_mpdclient_disconnect (self->priv->mpdclient);
xfmpc_interface_set_pp (self, FALSE);
xfmpc_interface_set_time (self, 0, 0);
@@ -423,7 +420,6 @@
GtkLabel* _tmp10_;
GtkHBox* box;
GtkVBox* vbox;
- xfce_textdomain (self->priv->gettext_package, self->priv->localedir, "UTF-8");
self->priv->mpdclient = xfmpc_mpdclient_get ();
self->priv->preferences = xfmpc_preferences_get ();
gtk_container_set_border_width ((GtkContainer*) self, (guint) 4);
@@ -534,16 +530,12 @@
static void xfmpc_interface_instance_init (XfmpcInterface * self) {
self->priv = XFMPC_INTERFACE_GET_PRIVATE (self);
- self->priv->gettext_package = g_strdup (GETTEXT_PACKAGE);
- self->priv->localedir = g_strdup (PACKAGE_LOCALE_DIR);
}
static void xfmpc_interface_finalize (GObject* obj) {
XfmpcInterface * self;
self = XFMPC_INTERFACE (obj);
- self->priv->gettext_package = (g_free (self->priv->gettext_package), NULL);
- self->priv->localedir = (g_free (self->priv->localedir), NULL);
(self->priv->button_prev == NULL) ? NULL : (self->priv->button_prev = (g_object_unref (self->priv->button_prev), NULL));
(self->priv->button_pp == NULL) ? NULL : (self->priv->button_pp = (g_object_unref (self->priv->button_pp), NULL));
(self->priv->button_next == NULL) ? NULL : (self->priv->button_next = (g_object_unref (self->priv->button_next), NULL));
Modified: xfmpc/trunk/src/interface.vala
===================================================================
--- xfmpc/trunk/src/interface.vala 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/interface.vala 2009-06-09 20:38:34 UTC (rev 7517)
@@ -26,9 +26,6 @@
private unowned Xfmpc.Mpdclient mpdclient;
private unowned Xfmpc.Preferences preferences;
- private string gettext_package = Config.GETTEXT_PACKAGE;
- private string localedir = Config.PACKAGE_LOCALE_DIR;
-
private Button button_prev;
private Button button_pp;
private Button button_next;
@@ -39,8 +36,6 @@
private bool refresh_title;
construct {
- Xfce.textdomain (gettext_package, localedir, "UTF-8");
-
mpdclient = Xfmpc.Mpdclient.get ();
preferences = Xfmpc.Preferences.get ();
Modified: xfmpc/trunk/src/main-window.c
===================================================================
--- xfmpc/trunk/src/main-window.c 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/main-window.c 2009-06-09 20:38:34 UTC (rev 7517)
@@ -22,12 +22,11 @@
#include <gtk/gtk.h>
#include <mpdclient.h>
#include <preferences.h>
+#include <gdk/gdk.h>
+#include <glib/gi18n-lib.h>
#include <stdlib.h>
#include <string.h>
#include <config.h>
-#include <gdk/gdk.h>
-#include <glib/gi18n-lib.h>
-#include <libxfce4util/libxfce4util.h>
#define XFMPC_TYPE_MAIN_WINDOW (xfmpc_main_window_get_type ())
@@ -83,8 +82,6 @@
struct _XfmpcMainWindowPrivate {
XfmpcMpdclient* mpdclient;
XfmpcPreferences* preferences;
- char* gettext_package;
- char* localedir;
GtkVBox* vbox;
GtkActionGroup* action_group;
GtkWidget* statusbar;
@@ -424,7 +421,6 @@
GtkActionGroup* _tmp4_;
GtkAccelGroup* _tmp5_;
GtkAccelGroup* accel_group;
- xfce_textdomain (self->priv->gettext_package, self->priv->localedir, "UTF-8");
self->priv->mpdclient = xfmpc_mpdclient_get ();
self->priv->preferences = xfmpc_preferences_get ();
/* Window */
@@ -531,16 +527,12 @@
static void xfmpc_main_window_instance_init (XfmpcMainWindow * self) {
self->priv = XFMPC_MAIN_WINDOW_GET_PRIVATE (self);
- self->priv->gettext_package = g_strdup (GETTEXT_PACKAGE);
- self->priv->localedir = g_strdup (PACKAGE_LOCALE_DIR);
}
static void xfmpc_main_window_finalize (GObject* obj) {
XfmpcMainWindow * self;
self = XFMPC_MAIN_WINDOW (obj);
- self->priv->gettext_package = (g_free (self->priv->gettext_package), NULL);
- self->priv->localedir = (g_free (self->priv->localedir), NULL);
(self->priv->vbox == NULL) ? NULL : (self->priv->vbox = (g_object_unref (self->priv->vbox), NULL));
(self->priv->action_group == NULL) ? NULL : (self->priv->action_group = (g_object_unref (self->priv->action_group), NULL));
(self->priv->statusbar == NULL) ? NULL : (self->priv->statusbar = (g_object_unref (self->priv->statusbar), NULL));
Modified: xfmpc/trunk/src/main-window.vala
===================================================================
--- xfmpc/trunk/src/main-window.vala 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/main-window.vala 2009-06-09 20:38:34 UTC (rev 7517)
@@ -26,9 +26,6 @@
private unowned Xfmpc.Mpdclient mpdclient;
private unowned Xfmpc.Preferences preferences;
- private string gettext_package = Config.GETTEXT_PACKAGE;
- private string localedir = Config.PACKAGE_LOCALE_DIR;
-
private VBox vbox;
private ActionGroup action_group;
private Widget statusbar;
@@ -51,8 +48,6 @@
private const int main_ui_length = 187u;
construct {
- Xfce.textdomain (gettext_package, localedir, "UTF-8");
-
mpdclient = Xfmpc.Mpdclient.get ();
preferences = Xfmpc.Preferences.get ();
Modified: xfmpc/trunk/src/playlist.c
===================================================================
--- xfmpc/trunk/src/playlist.c 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/playlist.c 2009-06-09 20:38:34 UTC (rev 7517)
@@ -24,11 +24,9 @@
#include <preferences.h>
#include <stdlib.h>
#include <string.h>
-#include <config.h>
#include <libxfcegui4/libxfcegui4.h>
#include <gdk/gdk.h>
#include <pango/pango.h>
-#include <libxfce4util/libxfce4util.h>
#include <glib/gi18n-lib.h>
@@ -89,8 +87,6 @@
struct _XfmpcPlaylistPrivate {
XfmpcMpdclient* mpdclient;
XfmpcPreferences* preferences;
- char* gettext_package;
- char* localedir;
GtkListStore* store;
GtkTreeModelFilter* filter;
GtkTreeView* treeview;
@@ -752,7 +748,6 @@
GtkImage* image;
GtkImageMenuItem* _tmp10_;
GtkEntry* _tmp11_;
- xfce_textdomain (self->priv->gettext_package, self->priv->localedir, "UTF-8");
self->priv->mpdclient = xfmpc_mpdclient_get ();
self->priv->preferences = xfmpc_preferences_get ();
self->priv->autocenter = xfmpc_preferences_get_playlist_autocenter (self->priv->preferences);
@@ -840,8 +835,6 @@
static void xfmpc_playlist_instance_init (XfmpcPlaylist * self) {
self->priv = XFMPC_PLAYLIST_GET_PRIVATE (self);
- self->priv->gettext_package = g_strdup (GETTEXT_PACKAGE);
- self->priv->localedir = g_strdup (PACKAGE_LOCALE_DIR);
self->priv->current = 0;
}
@@ -849,8 +842,6 @@
static void xfmpc_playlist_finalize (GObject* obj) {
XfmpcPlaylist * self;
self = XFMPC_PLAYLIST (obj);
- self->priv->gettext_package = (g_free (self->priv->gettext_package), NULL);
- self->priv->localedir = (g_free (self->priv->localedir), NULL);
(self->priv->store == NULL) ? NULL : (self->priv->store = (g_object_unref (self->priv->store), NULL));
(self->priv->filter == NULL) ? NULL : (self->priv->filter = (g_object_unref (self->priv->filter), NULL));
(self->priv->treeview == NULL) ? NULL : (self->priv->treeview = (g_object_unref (self->priv->treeview), NULL));
Modified: xfmpc/trunk/src/playlist.vala
===================================================================
--- xfmpc/trunk/src/playlist.vala 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/playlist.vala 2009-06-09 20:38:34 UTC (rev 7517)
@@ -26,9 +26,6 @@
private unowned Xfmpc.Mpdclient mpdclient;
private unowned Xfmpc.Preferences preferences;
- private string gettext_package = Config.GETTEXT_PACKAGE;
- private string localedir = Config.PACKAGE_LOCALE_DIR;
-
private ListStore store;
private TreeModelFilter filter;
private TreeView treeview;
@@ -52,8 +49,6 @@
}
construct {
- Xfce.textdomain (gettext_package, localedir, "UTF-8");
-
mpdclient = Xfmpc.Mpdclient.get ();
preferences = Xfmpc.Preferences.get ();
Modified: xfmpc/trunk/src/preferences-dialog.c
===================================================================
--- xfmpc/trunk/src/preferences-dialog.c 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/preferences-dialog.c 2009-06-09 20:38:34 UTC (rev 7517)
@@ -21,12 +21,10 @@
#include <glib-object.h>
#include <libxfcegui4/libxfcegui4.h>
#include <preferences.h>
-#include <stdlib.h>
-#include <string.h>
#include <gtk/gtk.h>
-#include <config.h>
#include <mpdclient.h>
-#include <libxfce4util/libxfce4util.h>
+#include <stdlib.h>
+#include <string.h>
#include <glib/gi18n-lib.h>
#include <pango/pango.h>
@@ -53,8 +51,6 @@
struct _XfmpcPreferencesDialogPrivate {
XfmpcPreferences* preferences;
- char* gettext_package;
- char* localedir;
GtkCheckButton* entry_use_defaults;
GtkEntry* entry_host;
GtkEntry* entry_passwd;
@@ -321,7 +317,6 @@
GtkLabel* _tmp31_;
GtkLabel* _tmp32_;
GtkLabel* _tmp33_;
- xfce_textdomain (self->priv->gettext_package, self->priv->localedir, "UTF-8");
gtk_dialog_set_has_separator ((GtkDialog*) self, TRUE);
gtk_window_set_skip_taskbar_hint ((GtkWindow*) self, TRUE);
gtk_window_set_icon_name ((GtkWindow*) self, "stock_volume");
@@ -515,16 +510,12 @@
static void xfmpc_preferences_dialog_instance_init (XfmpcPreferencesDialog * self) {
self->priv = XFMPC_PREFERENCES_DIALOG_GET_PRIVATE (self);
- self->priv->gettext_package = g_strdup (GETTEXT_PACKAGE);
- self->priv->localedir = g_strdup (PACKAGE_LOCALE_DIR);
}
static void xfmpc_preferences_dialog_finalize (GObject* obj) {
XfmpcPreferencesDialog * self;
self = XFMPC_PREFERENCES_DIALOG (obj);
- self->priv->gettext_package = (g_free (self->priv->gettext_package), NULL);
- self->priv->localedir = (g_free (self->priv->localedir), NULL);
(self->priv->entry_use_defaults == NULL) ? NULL : (self->priv->entry_use_defaults = (g_object_unref (self->priv->entry_use_defaults), NULL));
(self->priv->entry_host == NULL) ? NULL : (self->priv->entry_host = (g_object_unref (self->priv->entry_host), NULL));
(self->priv->entry_passwd == NULL) ? NULL : (self->priv->entry_passwd = (g_object_unref (self->priv->entry_passwd), NULL));
Modified: xfmpc/trunk/src/preferences-dialog.vala
===================================================================
--- xfmpc/trunk/src/preferences-dialog.vala 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/preferences-dialog.vala 2009-06-09 20:38:34 UTC (rev 7517)
@@ -25,9 +25,6 @@
private unowned Xfmpc.Preferences preferences;
- private string gettext_package = Config.GETTEXT_PACKAGE;
- private string localedir = Config.PACKAGE_LOCALE_DIR;
-
private CheckButton entry_use_defaults;
private Entry entry_host;
private Entry entry_passwd;
@@ -41,8 +38,6 @@
private VBox mpd_vbox;
construct {
- Xfce.textdomain (gettext_package, localedir, "UTF-8");
-
has_separator = true;
skip_taskbar_hint = true;
icon_name = "stock_volume";
Modified: xfmpc/trunk/src/song-dialog.c
===================================================================
--- xfmpc/trunk/src/song-dialog.c 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/song-dialog.c 2009-06-09 20:38:34 UTC (rev 7517)
@@ -20,11 +20,7 @@
#include <glib.h>
#include <glib-object.h>
#include <libxfcegui4/libxfcegui4.h>
-#include <stdlib.h>
-#include <string.h>
#include <mpdclient.h>
-#include <config.h>
-#include <libxfce4util/libxfce4util.h>
#include <gtk/gtk.h>
#include <pango/pango.h>
#include <glib/gi18n-lib.h>
@@ -51,8 +47,6 @@
};
struct _XfmpcSongDialogPrivate {
- char* gettext_package;
- char* localedir;
XfmpcMpdclient* mpdclient;
XfmpcSongInfo* song;
};
@@ -107,7 +101,6 @@
GtkLabel* _tmp18_;
GtkLabel* _tmp19_;
self = g_object_newv (object_type, 0, NULL);
- xfce_textdomain (self->priv->gettext_package, self->priv->localedir, "UTF-8");
gtk_dialog_set_has_separator ((GtkDialog*) self, TRUE);
gtk_window_set_skip_taskbar_hint ((GtkWindow*) self, TRUE);
gtk_window_set_icon_name ((GtkWindow*) self, "stock_volume");
@@ -231,16 +224,12 @@
static void xfmpc_song_dialog_instance_init (XfmpcSongDialog * self) {
self->priv = XFMPC_SONG_DIALOG_GET_PRIVATE (self);
- self->priv->gettext_package = g_strdup (GETTEXT_PACKAGE);
- self->priv->localedir = g_strdup (PACKAGE_LOCALE_DIR);
}
static void xfmpc_song_dialog_finalize (GObject* obj) {
XfmpcSongDialog * self;
self = XFMPC_SONG_DIALOG (obj);
- self->priv->gettext_package = (g_free (self->priv->gettext_package), NULL);
- self->priv->localedir = (g_free (self->priv->localedir), NULL);
G_OBJECT_CLASS (xfmpc_song_dialog_parent_class)->finalize (obj);
}
Modified: xfmpc/trunk/src/song-dialog.vala
===================================================================
--- xfmpc/trunk/src/song-dialog.vala 2009-06-09 19:20:04 UTC (rev 7516)
+++ xfmpc/trunk/src/song-dialog.vala 2009-06-09 20:38:34 UTC (rev 7517)
@@ -23,15 +23,10 @@
public class SongDialog : Xfce.TitledDialog {
- private string gettext_package = Config.GETTEXT_PACKAGE;
- private string localedir = Config.PACKAGE_LOCALE_DIR;
-
private unowned Xfmpc.Mpdclient mpdclient;
private unowned Xfmpc.SongInfo song;
public SongDialog (int song_id) {
- Xfce.textdomain (gettext_package, localedir, "UTF-8");
-
has_separator = true;
skip_taskbar_hint = true;
icon_name = "stock_volume";
More information about the Goodies-commits
mailing list