aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-02-14 04:31:50 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-02-14 04:31:50 +0800
commit31dc41be3718523052dc3d96cf3b603c68e81b55 (patch)
tree448d132398c6c79594ddc35b1eb7c13bdc1a9a29
parentafac6edb53f68a1c1c510eeaa1360c5a34e2e659 (diff)
downloadgsoc2013-evolution-31dc41be3718523052dc3d96cf3b603c68e81b55.tar
gsoc2013-evolution-31dc41be3718523052dc3d96cf3b603c68e81b55.tar.gz
gsoc2013-evolution-31dc41be3718523052dc3d96cf3b603c68e81b55.tar.bz2
gsoc2013-evolution-31dc41be3718523052dc3d96cf3b603c68e81b55.tar.lz
gsoc2013-evolution-31dc41be3718523052dc3d96cf3b603c68e81b55.tar.xz
gsoc2013-evolution-31dc41be3718523052dc3d96cf3b603c68e81b55.tar.zst
gsoc2013-evolution-31dc41be3718523052dc3d96cf3b603c68e81b55.zip
#include <stdio.h>
2003-02-13 Jeffrey Stedfast <fejj@ximian.com> * e-searching-tokenizer.c: #include <stdio.h> * mail-config-factory.c: #include <string.h> * mail-config-druid.c (identity_prepare): Use gtk_editable_select_region() since gtk_entry_select_region() has been deprecated. (construct): Use gtk_window_set_resizable() instead of gtk_window_set_policy(). (wizard_free): account_destroy() is no longer around, use g_object_unref() instead. (how did this even compile before?) * mail-account-gui.c (mail_account_gui_build_extra_conf): Use gtk_label_set_text_with_mnemonic() instead of gtk_label_parse_uline() as the latter has been deprecated. svn path=/trunk/; revision=19905
-rw-r--r--mail/ChangeLog18
-rw-r--r--mail/e-searching-tokenizer.c1
-rw-r--r--mail/mail-account-gui.c22
-rw-r--r--mail/mail-config-druid.c6
-rw-r--r--mail/mail-config-factory.c4
5 files changed, 36 insertions, 15 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4408d7bae5..74c1566e3a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,21 @@
+2003-02-13 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-searching-tokenizer.c: #include <stdio.h>
+
+ * mail-config-factory.c: #include <string.h>
+
+ * mail-config-druid.c (identity_prepare): Use
+ gtk_editable_select_region() since gtk_entry_select_region() has
+ been deprecated.
+ (construct): Use gtk_window_set_resizable() instead of
+ gtk_window_set_policy().
+ (wizard_free): account_destroy() is no longer around, use
+ g_object_unref() instead. (how did this even compile before?)
+
+ * mail-account-gui.c (mail_account_gui_build_extra_conf): Use
+ gtk_label_set_text_with_mnemonic() instead of
+ gtk_label_parse_uline() as the latter has been deprecated.
+
2003-02-12 Jeffrey Stedfast <fejj@ximian.com>
* importers/netscape-importer.c: Removed unused variables.
diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c
index bc6e37b7be..fdbd99c485 100644
--- a/mail/e-searching-tokenizer.c
+++ b/mail/e-searching-tokenizer.c
@@ -31,6 +31,7 @@
#include <config.h>
#endif
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index 607a0015ef..3d9488faf0 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -740,15 +740,15 @@ mail_account_gui_build_extra_conf (MailAccountGui *gui, const char *url_string)
url = NULL;
hostname_label = glade_xml_get_widget (gui->xml, "source_host_label");
- gtk_label_parse_uline (GTK_LABEL (hostname_label), _("_Host:"));
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (hostname_label), _("_Host:"));
hostname = glade_xml_get_widget (gui->xml, "source_host");
username_label = glade_xml_get_widget (gui->xml, "source_user_label");
- gtk_label_parse_uline (GTK_LABEL (username_label), _("User_name:"));
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (username_label), _("User_name:"));
username = glade_xml_get_widget (gui->xml, "source_user");
path_label = glade_xml_get_widget (gui->xml, "source_path_label");
- gtk_label_parse_uline (GTK_LABEL (path_label), _("_Path:"));
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (path_label), _("_Path:"));
path = glade_xml_get_widget (gui->xml, "source_path");
main_vbox = glade_xml_get_widget (gui->xml, "extra_vbox");
@@ -826,11 +826,11 @@ mail_account_gui_build_extra_conf (MailAccountGui *gui, const char *url_string)
GtkWidget *label;
if (!strcmp (entries[i].name, "username")) {
- gtk_label_parse_uline (GTK_LABEL (username_label), entries[i].text);
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (username_label), entries[i].text);
} else if (!strcmp (entries[i].name, "hostname")) {
- gtk_label_parse_uline (GTK_LABEL (hostname_label), entries[i].text);
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (hostname_label), entries[i].text);
} else if (!strcmp (entries[i].name, "path")) {
- gtk_label_parse_uline (GTK_LABEL (path_label), entries[i].text);
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (path_label), entries[i].text);
} else {
/* make a new label */
label = gtk_label_new (entries[i].text);
@@ -863,15 +863,15 @@ mail_account_gui_build_extra_conf (MailAccountGui *gui, const char *url_string)
const char *text;
if (!strcmp (entries[i].name, "username")) {
- gtk_label_parse_uline (GTK_LABEL (username_label), entries[i].text);
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (username_label), entries[i].text);
label = username_label;
entry = username;
} else if (!strcmp (entries[i].name, "hostname")) {
- gtk_label_parse_uline (GTK_LABEL (hostname_label), entries[i].text);
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (hostname_label), entries[i].text);
label = hostname_label;
entry = hostname;
} else if (!strcmp (entries[i].name, "path")) {
- gtk_label_parse_uline (GTK_LABEL (path_label), entries[i].text);
+ gtk_label_set_text_with_mnemonic (GTK_LABEL (path_label), entries[i].text);
label = path_label;
entry = path;
} else {
@@ -1594,7 +1594,7 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top)
hstore = si;
}
- if (source_proto && !g_strcasecmp (provider->protocol, source_proto)) {
+ if (source_proto && !strcasecmp (provider->protocol, source_proto)) {
fstore = item;
hstore = si;
}
@@ -1621,7 +1621,7 @@ mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top)
htransport = ti;
}
- if (transport_proto && !g_strcasecmp (provider->protocol, transport_proto)) {
+ if (transport_proto && !strcasecmp (provider->protocol, transport_proto)) {
ftransport = item;
htransport = ti;
}
diff --git a/mail/mail-config-druid.c b/mail/mail-config-druid.c
index c7791e3646..15a44b8b69 100644
--- a/mail/mail-config-druid.c
+++ b/mail/mail-config-druid.c
@@ -258,7 +258,7 @@ identity_prepare (EvolutionWizard *wizard, gpointer data)
if (!name) {
name = g_get_real_name ();
gtk_entry_set_text (gui->gui->full_name, name ? name : "");
- gtk_entry_select_region (gui->gui->full_name, 0, -1);
+ gtk_editable_select_region (GTK_EDITABLE (gui->gui->full_name), 0, -1);
}
gtk_widget_grab_focus (GTK_WIDGET (gui->gui->full_name));
identity_changed (NULL, data);
@@ -643,7 +643,7 @@ construct (MailConfigDruid *druid)
/* set window title */
gtk_window_set_title (GTK_WINDOW (druid), _("Evolution Account Assistant"));
- gtk_window_set_policy (GTK_WINDOW (druid), FALSE, TRUE, FALSE);
+ gtk_window_set_resizable (GTK_WINDOW (druid), TRUE);
gtk_window_set_modal (GTK_WINDOW (druid), FALSE);
g_object_set (G_OBJECT (druid), "type", GTK_WINDOW_TOPLEVEL, NULL);
@@ -996,7 +996,7 @@ wizard_free (MailConfigWizard *wizard)
mail_account_gui_destroy (wizard->gui);
if (wizard->account)
- account_destroy (wizard->account);
+ g_object_unref (wizard->account);
g_free (wizard);
}
diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c
index 8780973535..bda05e83ad 100644
--- a/mail/mail-config-factory.c
+++ b/mail/mail-config-factory.c
@@ -25,6 +25,8 @@
#include <config.h>
#endif
+#include <string.h>
+
#include "mail-accounts.h"
#include "mail-preferences.h"
#include "mail-composer-prefs.h"
@@ -93,7 +95,7 @@ mail_config_control_factory_cb (BonoboGenericFactory *factory, const char *compo
}
data->prefs = prefs;
- g_object_ref((prefs));
+ g_object_ref (prefs);
gtk_widget_show_all (prefs);