more fixes

svn path=/trunk/; revision=19203

3 files changed, 9 insertions, 9 deletions

diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 34f1ba61e7..058bcb6407 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -366,8 +366,8 @@ set_values (FilterDatespec *fds)
 		break;
 	}
 	
-	gtk_notebook_set_page((GtkNotebook*)p->notebook_type, p->type);
-	gtk_option_menu_set_history((GtkOptionMenu*)p->option_type, p->type);
+	gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, p->type);
+	gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, p->type);
 }
 
 
@@ -379,7 +379,7 @@ set_option_type (GtkMenu *menu, FilterDatespec *fds)
 	/* ugh, no other way to 'get_history' */
 	w = gtk_menu_get_active (menu);
 	fds->priv->type = g_list_index (GTK_MENU_SHELL (menu)->children, w);
-	gtk_notebook_set_page ((GtkNotebook*) fds->priv->notebook_type, fds->priv->type);
+	gtk_notebook_set_current_page ((GtkNotebook*) fds->priv->notebook_type, fds->priv->type);
 }
 
 static void
@@ -477,10 +477,10 @@ format_sexp (FilterElement *fe, GString *out)
 		g_string_append (out, "(get-current-date)");
 		break;
 	case FDST_SPECIFIED:
-		g_string_sprintfa (out, "%d", (int) fds->value);
+		g_string_append_printf (out, "%d", (int) fds->value);
 		break;
 	case FDST_X_AGO:
-		g_string_sprintfa (out, "(- (get-current-date) %d)", (int) fds->value);
+		g_string_append_printf (out, "(- (get-current-date) %d)", (int) fds->value);
 		break;
 	}
 }
diff --git a/filter/filter-int.c b/filter/filter-int.c
index 16d7afa01e..17f568c766 100644
--- a/filter/filter-int.c
+++ b/filter/filter-int.c
@@ -250,5 +250,5 @@ format_sexp (FilterElement *fe, GString *out)
 {
 	FilterInt *fs = (FilterInt *)fe;
 	
-	g_string_sprintfa (out, "%d", fs->val);
+	g_string_append_printf (out, "%d", fs->val);
 }
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 1e8c74c3f4..5f8a53304a 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -489,15 +489,15 @@ filter_part_expand_code (FilterPart *ff, const char *source, GString *out)
 		fe = filter_part_find_element (ff, name);
 		d(printf("expand code: looking up variab le '%s' = %p\n", ff, name, fe));
 		if (fe) {
-			g_string_sprintfa (out, "%.*s", newstart-start, start);
+			g_string_append_printf (out, "%.*s", newstart-start, start);
 			filter_element_format_sexp (fe, out);
 #if 0
 		} else if ((val = g_hash_table_lookup (ff->globals, name))) {
-			g_string_sprintfa (out, "%.*s", newstart-start, start);
+			g_string_append_printf (out, "%.*s", newstart-start, start);
 			e_sexp_encode_string (out, val);
 #endif
 		} else {
-			g_string_sprintfa (out, "%.*s", end-start+1, start);
+			g_string_append_printf (out, "%.*s", end-start+1, start);
 		}
 		start = end + 1;
 	}