diff options
author | Kjartan Maraas <kmaraas@gnome.org> | 2008-11-21 14:55:44 +0000 |
---|---|---|
committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2008-11-21 14:55:44 +0000 |
commit | 606222f8191c57240ac8558d2ee8c5802a41fd95 (patch) | |
tree | bd31a3315604a9ed5dda7952b55a7990582c3216 | |
parent | fa932f5e06b12a296721a5327760f11afab6228f (diff) | |
download | gdk-pixbuf-606222f8191c57240ac8558d2ee8c5802a41fd95.tar.gz |
Missing format specifiers and some other small bits. Bugzilla bug #554567.
2008-11-21 Kjartan Maraas <kmaraas@gnome.org>
* gtk/gtkbuilder.c: (_gtk_builder_flags_from_string):
* gtk/gtkfilechooserdefault.c:
(file_list_drag_data_received_get_info_cb):
* gtk/gtkiconfactory.c: (icon_source_start_element):
* gtk/gtkprintbackend.c: (gtk_print_backend_module_load):
* gtk/gtkprintoperation.c: (run_pdf):
* gtk/gtkthemes.c: (gtk_theme_engine_load):
* gtk/tests/builder.c: (test_file):
* tests/testmerge.c: (dump_tree):
Missing format specifiers and some other small bits.
Bugzilla bug #554567.
svn path=/branches/gtk-2-14/; revision=21797
-rw-r--r-- | ChangeLog | 14 | ||||
-rw-r--r-- | gtk/gtkbuilder.c | 2 | ||||
-rw-r--r-- | gtk/gtkfilechooserdefault.c | 2 | ||||
-rw-r--r-- | gtk/gtkiconfactory.c | 2 | ||||
-rw-r--r-- | gtk/gtkprintbackend.c | 4 | ||||
-rw-r--r-- | gtk/gtkprintoperation.c | 8 | ||||
-rw-r--r-- | gtk/gtkthemes.c | 4 | ||||
-rw-r--r-- | gtk/tests/builder.c | 2 | ||||
-rw-r--r-- | tests/testmerge.c | 2 |
9 files changed, 27 insertions, 13 deletions
@@ -1,3 +1,17 @@ +2008-11-21 Kjartan Maraas <kmaraas@gnome.org> + + * gtk/gtkbuilder.c: (_gtk_builder_flags_from_string): + * gtk/gtkfilechooserdefault.c: + (file_list_drag_data_received_get_info_cb): + * gtk/gtkiconfactory.c: (icon_source_start_element): + * gtk/gtkprintbackend.c: (gtk_print_backend_module_load): + * gtk/gtkprintoperation.c: (run_pdf): + * gtk/gtkthemes.c: (gtk_theme_engine_load): + * gtk/tests/builder.c: (test_file): + * tests/testmerge.c: (dump_tree): + Missing format specifiers and some other small bits. + Bugzilla bug #554567. + 2008-11-14 Matthias Clasen <mclasen@redhat.com> Merged from trunk: diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index 1ea7db3ac..efb621e92 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -1456,7 +1456,7 @@ _gtk_builder_flags_from_string (GType type, gboolean eos, ret; g_return_val_if_fail (G_TYPE_IS_FLAGS (type), FALSE); - g_return_val_if_fail (string != 0, FALSE); + g_return_val_if_fail (string != NULL, FALSE); ret = TRUE; diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 16759a167..cd97cc29b 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -4165,7 +4165,7 @@ file_list_drag_data_received_get_info_cb (GCancellable *cancellable, if ((data->impl->action == GTK_FILE_CHOOSER_ACTION_OPEN || data->impl->action == GTK_FILE_CHOOSER_ACTION_SAVE) && - data->uris[1] == 0 && !error && + data->uris[1] == NULL && !error && g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) change_folder_and_display_error (data->impl, data->file, FALSE); else diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index d7818398d..ba90ddd09 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -2863,7 +2863,7 @@ icon_source_start_element (GMarkupParseContext *context, error_domain, tmp); #else - g_warning (tmp); + g_warning ("%s", tmp); #endif g_free (tmp); g_free (stock_id); diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index 1f21aaf8e..2889b94fb 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -119,7 +119,7 @@ gtk_print_backend_module_load (GTypeModule *module) pb_module->library = g_module_open (pb_module->path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); if (!pb_module->library) { - g_warning (g_module_error()); + g_warning ("%s", g_module_error()); return FALSE; } @@ -131,7 +131,7 @@ gtk_print_backend_module_load (GTypeModule *module) !g_module_symbol (pb_module->library, "pb_module_create", &createp)) { - g_warning (g_module_error()); + g_warning ("%s", g_module_error()); g_module_close (pb_module->library); return FALSE; diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c index 321240d82..0b9229272 100644 --- a/gtk/gtkprintoperation.c +++ b/gtk/gtkprintoperation.c @@ -1848,10 +1848,10 @@ run_pdf (GtkPrintOperation *op, width, height); if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS) { - g_set_error (&priv->error, - GTK_PRINT_ERROR, - GTK_PRINT_ERROR_GENERAL, - cairo_status_to_string (cairo_surface_status (surface))); + g_set_error_literal (&priv->error, + GTK_PRINT_ERROR, + GTK_PRINT_ERROR_GENERAL, + cairo_status_to_string (cairo_surface_status (surface))); *do_print = FALSE; return GTK_PRINT_OPERATION_RESULT_ERROR; } diff --git a/gtk/gtkthemes.c b/gtk/gtkthemes.c index 919562a56..d6d9f7940 100644 --- a/gtk/gtkthemes.c +++ b/gtk/gtkthemes.c @@ -81,7 +81,7 @@ gtk_theme_engine_load (GTypeModule *module) g_free(engine_path); if (!engine->library) { - g_warning (g_module_error()); + g_warning ("%s", g_module_error()); return FALSE; } @@ -93,7 +93,7 @@ gtk_theme_engine_load (GTypeModule *module) !g_module_symbol (engine->library, "theme_create_rc_style", (gpointer *)&engine->create_rc_style)) { - g_warning (g_module_error()); + g_warning ("%s", g_module_error()); g_module_close (engine->library); return FALSE; diff --git a/gtk/tests/builder.c b/gtk/tests/builder.c index 2c72b71c3..27434c4ac 100644 --- a/gtk/tests/builder.c +++ b/gtk/tests/builder.c @@ -2293,7 +2293,7 @@ test_file (const gchar *filename) if (!gtk_builder_add_from_file (builder, filename, &error)) { - g_error (error->message); + g_error ("%s", error->message); g_error_free (error); return; } diff --git a/tests/testmerge.c b/tests/testmerge.c index 957f5e2fa..125fba525 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -43,7 +43,7 @@ dump_tree (GtkWidget *button, gchar *dump; dump = gtk_ui_manager_get_ui (merge); - g_message (dump); + g_message ("%s", dump); g_free (dump); } |