aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/groupwise-features/ChangeLog10
-rw-r--r--plugins/groupwise-features/junk-settings.c9
-rw-r--r--plugins/groupwise-features/process-meeting.c2
-rw-r--r--plugins/groupwise-features/proxy-login.c10
-rw-r--r--plugins/groupwise-features/proxy.c26
-rw-r--r--plugins/groupwise-features/share-folder.c18
6 files changed, 67 insertions, 8 deletions
diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 328ccec90c..953c862ff7 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,13 @@
+2005-12-17 Tor Lillqvist <tml@novell.com>
+
+ * junk-settings.c
+ * proxy-login.c
+ * proxy.c
+ * share-folder.c: Construct glade file name at run-time.
+
+ * process-meeting.c (find_attendee): Use g_ascii_strcasecmp()
+ instead of g_strcasecmp().
+
2005-12-12 Harish Krishnaswamy <kharish@novell.com>
* Makefile.am: Fix make-clean issues.
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index c2bba7ab1d..90ea657cf2 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -38,6 +38,7 @@
#include <libgnomeui/gnome-ui-init.h>
#include <libgnome/gnome-init.h>
#include <e-util/e-error.h>
+#include <e-util/e-util-private.h>
#include <e-gw-connection.h>
#define ROOTNODE "vboxSettings"
#define d(x)
@@ -375,8 +376,14 @@ junk_settings_construct (JunkSettings *js)
{
GladeXML *xml;
GtkWidget *box;
+ char *gladefile;
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "junk-settings.glade",
+ NULL);
+ xml = glade_xml_new (gladefile, ROOTNODE, NULL);
+ g_free (gladefile);
- xml = glade_xml_new (EVOLUTION_GLADEDIR "/junk-settings.glade", ROOTNODE, NULL);
js->xml =xml;
if (!js->xml) {
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 424d8edeba..91f0384ee7 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -152,7 +152,7 @@ find_attendee (icalcomponent *ical_comp, const char *address)
text = g_strdup (itip_strip_mailto (attendee));
text = g_strstrip (text);
- if (!g_strcasecmp (address, text)) {
+ if (!g_ascii_strcasecmp (address, text)) {
g_free (text);
break;
}
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index a0581438c2..9c6eebfffd 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -56,6 +56,7 @@
#include <e-util/e-account.h>
#include <e-util/e-error.h>
#include <e-util/e-icon-factory.h>
+#include <e-util/e-util-private.h>
#include <e-gw-container.h>
#include <e-gw-connection.h>
@@ -472,6 +473,7 @@ org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data)
char *uri = data;
proxyLoginPrivate *priv;
EGwConnection *cnc;
+ char *gladefile;
/* This pops-up the password dialog in case the User has forgot-passwords explicitly */
cnc = proxy_login_get_cnc (mail_config_get_account_by_source_url (uri));
@@ -479,7 +481,13 @@ org_gnome_proxy_account_login (EPopup *ep, EPopupItem *p, void *data)
pld = proxy_login_new();
priv = pld->priv;
- priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/proxy-login-dialog.glade", NULL, NULL);
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "proxy-login-dialog.glade",
+ NULL);
+ priv->xml = glade_xml_new (gladefile, NULL, NULL);
+ g_free (gladefile);
+
priv->main = glade_xml_get_widget (priv->xml, "proxy_login_dialog");
pld->account = mail_config_get_account_by_source_url (uri);
priv->tree = GTK_TREE_VIEW (glade_xml_get_widget (priv->xml, "proxy_login_treeview"));
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index f896e6686e..db1f2d6199 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -46,6 +46,7 @@
#include <libgnomeui/gnome-ui-init.h>
#include <libgnome/gnome-init.h>
#include <e-util/e-error.h>
+#include <e-util/e-util-private.h>
#include <e-gw-container.h>
#include <e-gw-connection.h>
#include <e-gw-message.h>
@@ -648,6 +649,7 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
CamelOfflineStore *store;
CamelException ex;
int pag_num;
+ char *gladefile;
target_account = (EMConfigTargetAccount *)data->config->target;
account = target_account->account;
@@ -663,7 +665,12 @@ org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data)
prd = proxy_dialog_new ();
g_object_set_data_full ((GObject *) account, "prd", prd, (GDestroyNotify) g_object_unref);
priv = prd->priv;
- priv->xml_tab = glade_xml_new (EVOLUTION_GLADEDIR "/proxy-listing.glade", "proxy_vbox", NULL);
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "proxy-listing.glade",
+ NULL);
+ priv->xml_tab = glade_xml_new (gladefile, "proxy_vbox", NULL);
+ g_free (gladefile);
if (account->enabled && (store->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)) {
priv->tab_dialog = GTK_WIDGET (glade_xml_get_widget (priv->xml_tab, "proxy_vbox"));
@@ -872,10 +879,17 @@ proxy_add_account (GtkWidget *button, EAccount *account)
ENameSelectorEntry *name_selector_entry;
GtkWidget *proxy_name, *name_box;
proxyDialog *prd = NULL;
+ char *gladefile;
prd = g_object_get_data ((GObject *)account, "prd");
priv = prd->priv;
- priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/proxy-add-dialog.glade", NULL, NULL);
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "proxy-add-dialog.glade",
+ NULL);
+ priv->xml = glade_xml_new (gladefile, NULL, NULL);
+ g_free (gladefile);
+
proxy_dialog_initialize_widgets (account);
priv->main = glade_xml_get_widget (priv->xml, "ProxyAccessRights");
okButton = (GtkButton *) glade_xml_get_widget (priv->xml,"proxy_button_ok");
@@ -966,6 +980,7 @@ proxy_edit_account (GtkWidget *button, EAccount *account)
char *account_mailid;
GtkWidget *contacts;
proxyDialog *prd = NULL;
+ char *gladefile;
prd = g_object_get_data ((GObject *)account, "prd");
priv = prd->priv;
@@ -979,7 +994,12 @@ proxy_edit_account (GtkWidget *button, EAccount *account)
account_mailid = g_strrstr (account_mailid, "\n") + 1;
edited = proxy_get_item_from_list (account, account_mailid);
if (edited) {
- priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/proxy-add-dialog.glade", NULL, NULL);
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "proxy-add-dialog.glade",
+ NULL);
+ priv->xml = glade_xml_new (gladefile, NULL, NULL);
+ g_free (gladefile);
+
priv->main = glade_xml_get_widget (priv->xml, "ProxyAccessRights");
proxy_dialog_initialize_widgets (account);
okButton = (GtkButton *) glade_xml_get_widget (priv->xml,"proxy_button_ok");
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 847279c2d2..beb4e0a533 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -39,6 +39,7 @@
#include <libgnomeui/gnome-ui-init.h>
#include <libgnome/gnome-init.h>
#include <e-util/e-error.h>
+#include <e-util/e-util-private.h>
#include <e-gw-container.h>
#include <e-gw-connection.h>
#define ROOTNODE "vboxSharing"
@@ -519,9 +520,16 @@ notification_clicked(GtkButton *button, ShareFolder *sf)
GtkButton *not_ok;
GtkButton *not_cancel;
GtkWidget *vbox;
+ char *gladefile;
sf->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- xmln = glade_xml_new (EVOLUTION_GLADEDIR "/properties.glade", NROOTNODE , NULL);
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "properties.glade",
+ NULL);
+ xmln = glade_xml_new (gladefile, NROOTNODE , NULL);
+ g_free (gladefile);
+
vbox = GTK_WIDGET (glade_xml_get_widget (xmln, "vbox191"));
gtk_container_add (GTK_CONTAINER (sf->window), vbox);
sf->subject = GTK_ENTRY (glade_xml_get_widget (xmln, "entry3"));
@@ -681,8 +689,14 @@ share_folder_construct (ShareFolder *sf)
ENameSelectorModel *name_selector_model;
ENameSelectorEntry *name_selector_entry;
GtkWidget *box;
+ char *gladefile;
+
+ gladefile = g_build_filename (EVOLUTION_GLADEDIR,
+ "properties.glade",
+ NULL);
+ xml = glade_xml_new (gladefile, ROOTNODE, NULL);
+ g_free (gladefile);
- xml = glade_xml_new (EVOLUTION_GLADEDIR "/properties.glade", ROOTNODE, NULL);
sf->xml =xml;
if (!sf->xml) {
generated by cgit (git 2.34.1) at 2024-11-16 15:13:21 +0800