[Goodies-commits] r5244 - in xfce4-mailwatch-plugin/trunk: libmailwatch-core panel-plugin
Brian Tarricone
kelnos at xfce.org
Sat Aug 16 10:49:55 CEST 2008
Author: kelnos
Date: 2008-08-16 08:49:55 +0000 (Sat, 16 Aug 2008)
New Revision: 5244
Modified:
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c
xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c
xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin-4.2.c
Log:
remove spurious instances of xfce_textdomain()
i guess they're from back in the day when i didn't know how that stuff worked
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c 2008-08-16 08:49:43 UTC (rev 5243)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-imap.c 2008-08-16 08:49:55 UTC (rev 5244)
@@ -1353,8 +1353,6 @@
return;
}
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
if(!imailbox->host || !imailbox->username) {
xfce_message_dialog(toplevel, _("Error"), GTK_STOCK_DIALOG_WARNING,
_("No server or username is set."),
@@ -1566,8 +1564,6 @@
GtkWidget *dlg, *topvbox, *vbox, *hbox, *lbl, *entry, *frame, *frame_bin,
*chk, *combo;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
dlg = gtk_dialog_new_with_buttons(_("Advanced IMAP Options"),
GTK_WINDOW(gtk_widget_get_toplevel(w)),
GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
@@ -1671,8 +1667,6 @@
*sbtn;
GtkSizeGroup *sg;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
topvbox = gtk_vbox_new(FALSE, BORDER/2);
gtk_widget_show(topvbox);
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c 2008-08-16 08:49:43 UTC (rev 5243)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-maildir.c 2008-08-16 08:49:55 UTC (rev 5244)
@@ -339,8 +339,6 @@
DBG( "-->>" );
- xfce_textdomain( GETTEXT_PACKAGE, LOCALEDIR, "UTF-8" );
-
parent = gtk_widget_get_toplevel( button );
chooser = gtk_file_chooser_dialog_new( _( "Select Maildir Folder" ),
GTK_WINDOW( parent ),
@@ -392,8 +390,6 @@
DBG( "-->>" );
- xfce_textdomain( GETTEXT_PACKAGE, LOCALEDIR, "UTF-8" );
-
vbox = gtk_vbox_new( FALSE, BORDER / 2 );
gtk_widget_show( vbox );
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c 2008-08-16 08:49:43 UTC (rev 5243)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-mbox.c 2008-08-16 08:49:55 UTC (rev 5244)
@@ -364,8 +364,6 @@
gint result;
GtkWidget *top;
- xfce_textdomain( GETTEXT_PACKAGE, LOCALEDIR, "UTF-8" );
-
top = gtk_widget_get_toplevel( button );
chooser = gtk_file_chooser_dialog_new( _( "Select mbox file" ),
@@ -404,8 +402,6 @@
GtkWidget *button, *image, *spinner;
GtkSizeGroup *sg;
- xfce_textdomain( GETTEXT_PACKAGE, LOCALEDIR, "UTF-8" );
-
vbox = gtk_vbox_new( FALSE, BORDER / 2 );
gtk_widget_show( vbox );
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c 2008-08-16 08:49:43 UTC (rev 5243)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch-mailbox-pop3.c 2008-08-16 08:49:55 UTC (rev 5244)
@@ -703,8 +703,6 @@
GtkWidget *dlg, *topvbox, *vbox, *hbox, *entry, *frame, *frame_bin, *chk,
*combo;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
dlg = gtk_dialog_new_with_buttons(_("Advanced POP3 Options"),
GTK_WINDOW(gtk_widget_get_toplevel(w)),
GTK_DIALOG_DESTROY_WITH_PARENT|GTK_DIALOG_NO_SEPARATOR,
@@ -785,8 +783,6 @@
*sbtn;
GtkSizeGroup *sg;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
topvbox = gtk_vbox_new(FALSE, BORDER/2);
gtk_widget_show(topvbox);
Modified: xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c 2008-08-16 08:49:43 UTC (rev 5243)
+++ xfce4-mailwatch-plugin/trunk/libmailwatch-core/mailwatch.c 2008-08-16 08:49:55 UTC (rev 5244)
@@ -118,12 +118,14 @@
{
XfceMailwatch *mailwatch;
- if(!g_thread_supported())
- g_thread_init(NULL);
+ xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
+
if(!g_thread_supported()) {
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
- g_critical(_("xfce4-mailwatch-plugin: Unable to initialise GThread support. This is likely a problem with your GLib install."));
- return NULL;
+ g_thread_init(NULL);
+ if(!g_thread_supported()) {
+ g_critical(_("xfce4-mailwatch-plugin: Unable to initialise GThread support. This is likely a problem with your GLib install."));
+ return NULL;
+ }
}
mailwatch = g_new0(XfceMailwatch, 1);
@@ -322,8 +324,6 @@
g_return_val_if_fail(mailwatch, FALSE);
g_return_val_if_fail(mailwatch->config_file, FALSE);
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
if(*mailwatch->config_file != '/') {
config_file = xfce_resource_save_location(XFCE_RESOURCE_CONFIG,
mailwatch->config_file,
@@ -601,8 +601,6 @@
g_return_val_if_fail(title && mailbox && new_mailbox_name, FALSE);
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
cfg_box = mailbox->type->get_setup_page_func(mailbox);
if(!cfg_box) {
/* Even the mailboxes that don't have configurable settings need a name */
@@ -685,8 +683,6 @@
GtkTreeIter itr;
gboolean ret = FALSE;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
if(gtk_tree_selection_get_selected(sel, &model, &itr)) {
gchar *mailbox_name = NULL, *win_title = NULL, *new_mailbox_name = NULL;
XfceMailwatchMailboxData *mdata = NULL;
@@ -742,8 +738,6 @@
if(active_index >= g_list_length(mailwatch->mailbox_types))
return;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
mbox_type = g_list_nth_data(mailwatch->mailbox_types, active_index);
gtk_label_set_text(GTK_LABEL(mailwatch->mbox_types_lbl),
@@ -760,8 +754,6 @@
GtkWidget *dlg, *topvbox, *lbl, *combo;
GList *l;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
dlg = gtk_dialog_new_with_buttons(_("Select Mailbox Type"), parent,
GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
@@ -818,8 +810,6 @@
gchar *new_mailbox_name = NULL;
GtkWindow *parent = GTK_WINDOW(gtk_widget_get_toplevel(w));
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
mailbox_type = config_ask_new_mailbox_type(mailwatch, parent);
if(!mailbox_type)
return;
@@ -864,7 +854,6 @@
{
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(mailwatch->config_treeview));
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
config_do_edit_window(sel, GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(w))));
}
@@ -888,8 +877,6 @@
return;
mailbox = mailbox_data->mailbox;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
parent = GTK_WINDOW(gtk_widget_get_toplevel(mailwatch->config_treeview));
resp = xfce_message_dialog(parent, _("Remove Mailbox"),
GTK_STOCK_DIALOG_QUESTION, _("Are you sure?"),
@@ -958,8 +945,6 @@
GtkCellRenderer *render;
GtkTreeSelection *sel;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
frame = xfce_mailwatch_create_framebox(_("Mailboxes"), &frame_bin);
gtk_widget_show(frame);
Modified: xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin-4.2.c
===================================================================
--- xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin-4.2.c 2008-08-16 08:49:43 UTC (rev 5243)
+++ xfce4-mailwatch-plugin/trunk/panel-plugin/mailwatch-plugin-4.2.c 2008-08-16 08:49:55 UTC (rev 5244)
@@ -245,8 +245,6 @@
XfceMailwatchPlugin *mwp = g_new0(XfceMailwatchPlugin, 1);
c->data = mwp;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
mwp->mailwatch = xfce_mailwatch_new();
if(G_UNLIKELY(!mwp->mailwatch)) {
@@ -472,8 +470,6 @@
return;
}
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
mwp->log_status = 0;
mailwatch_set_icon( mwp, mwp->newmail_icon_visible );
@@ -669,8 +665,6 @@
GtkContainer *cfg_page;
GtkSizeGroup *sg;
- xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
-
topvbox = gtk_vbox_new(FALSE, BORDER/2);
gtk_widget_show(topvbox);
gtk_container_add(con, topvbox);
More information about the Goodies-commits
mailing list