aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell-importer.c4
-rw-r--r--shell/importer/intelligent.c6
3 files changed, 12 insertions, 5 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6731a165bd..a422242e90 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-30 Kjartan Maraas <kmaraas@gnome.org>
+
+ * e-shell-importer.c: (import_cb): use g_timeout_add().
+ * importer/intelligent.c: (select_row_cb), (unselect_row_cb),
+ (create_gui): use gtk_notebook_set_current_page() instead of
+ deprecated gtk_notebook_set_page()
+
2004-09-24 Not Zed <NotZed@Ximian.com>
* e-shell-window-commands.c: Added ed catmur to the credits.
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index d8608371ff..2ad0899580 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -214,13 +214,13 @@ import_cb (EvolutionImporterListener *listener,
IN;
if (icd->stop != TRUE) {
if (result == EVOLUTION_IMPORTER_NOT_READY) {
- gtk_timeout_add (500, importer_timeout_fn, data);
+ g_timeout_add (500, importer_timeout_fn, data);
OUT;
return;
}
if (result == EVOLUTION_IMPORTER_BUSY) {
- gtk_timeout_add (500, importer_timeout_fn, data);
+ g_timeout_add (500, importer_timeout_fn, data);
OUT;
return;
}
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index 16cfad30ff..2043abadb4 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -162,7 +162,7 @@ select_row_cb (GtkCList *clist,
GdkEvent *ev,
IntelligentImporterDialog *d)
{
- gtk_notebook_set_page (GTK_NOTEBOOK (d->placeholder), row);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (d->placeholder), row);
}
static void
@@ -172,7 +172,7 @@ unselect_row_cb (GtkCList *clist,
GdkEvent *ev,
IntelligentImporterDialog *d)
{
- gtk_notebook_set_page (GTK_NOTEBOOK (d->placeholder), d->running);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (d->placeholder), d->running);
}
static IntelligentImporterDialog *
@@ -363,7 +363,7 @@ create_gui (GList *importers)
gtk_notebook_append_page (GTK_NOTEBOOK (d->placeholder),
dummy, NULL);
/* Set the start to the blank page */
- gtk_notebook_set_page (GTK_NOTEBOOK (d->placeholder), running);
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (d->placeholder), running);
g_signal_connect((clist), "select-row",
G_CALLBACK (select_row_cb), d);