From be99f3db8925de2016528d50f32339a73fcd10c8 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Wed, 31 Oct 2007 12:30:29 +0000 Subject: Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of function 2007-10-29 Kjartan Maraas * e-activity-handler.c: (e_activity_handler_new): * e-canvas.c: (e_canvas_new), (emit_event), (pick_current_item), (e_canvas_button): * e-combo-button.c: (menu_detacher), (impl_destroy), (impl_button_press_event): * e-combo-cell-editable.c: (e_combo_cell_editable_new): * e-expander.c: (e_expander_init), (e_expander_size_request), (e_expander_size_allocate), (e_expander_button_press), (e_expander_focus): * e-gui-utils.c: (e_popup_menu), (e_container_change_tab_order_callback): * e-image-chooser.c: (image_drag_data_received_cb): * e-info-label.c: (e_info_label_new): * e-map.c: (e_map_key_press), (e_map_new), (update_render_pixbuf), (blowup_window_area), (zoom_do), (set_scroll_area): * e-pilot-settings.c: (e_pilot_settings_get_source): * e-printable.c: (e_printable_will_fit): * e-reflow.c: (items_inserted), (model_changed), (set_empty), (e_reflow_event), (e_reflow_draw): * e-search-bar.c: (set_option): * e-search-bar.h: * e-unicode.c: (e_xml_get_translated_utf8_string_prop_by_name): Warning fixes: - NULL vs 0 vs FALSE - ANSIfication of function declarations. - Use non-deprecated GSignal functions - Don't mix different enum types svn path=/trunk/; revision=34466 --- widgets/misc/e-map.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) (limited to 'widgets/misc/e-map.c') diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c index eb6a3b3aa5..17c1ecbb35 100644 --- a/widgets/misc/e-map.c +++ b/widgets/misc/e-map.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include "e-util/e-util-private.h" @@ -102,7 +101,7 @@ static gint e_map_expose (GtkWidget *widget, GdkEventExpose *event); static gint e_map_key_press (GtkWidget *widget, GdkEventKey *event); static void e_map_set_scroll_adjustments (GtkWidget *widget, GtkAdjustment *hadj, GtkAdjustment *vadj); -static void update_render_pixbuf (EMap *map, ArtFilterLevel interp, gboolean render_overlays); +static void update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays); static void set_scroll_area (EMap *view); static void request_paint_area (EMap *view, GdkRectangle *area); static void center_at (EMap *map, int x, int y, gboolean scroll); @@ -585,17 +584,17 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event) scroll_to (view, x, y); - gtk_signal_handler_block_by_data (GTK_OBJECT (priv->hadj), view); - gtk_signal_handler_block_by_data (GTK_OBJECT (priv->vadj), view); + g_signal_handlers_block_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); + g_signal_handlers_block_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); priv->hadj->value = x; priv->vadj->value = y; - gtk_signal_emit_by_name (GTK_OBJECT (priv->hadj), "value_changed"); - gtk_signal_emit_by_name (GTK_OBJECT (priv->vadj), "value_changed"); + g_signal_emit_by_name (priv->hadj, "value_changed"); + g_signal_emit_by_name (priv->vadj, "value_changed"); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->hadj), view); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->vadj), view); + g_signal_handlers_unblock_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); + g_signal_handlers_unblock_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); } return TRUE; @@ -617,7 +616,7 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event) **/ EMap * -e_map_new () +e_map_new (void) { GtkWidget *widget; AtkObject *a11y; @@ -967,7 +966,7 @@ load_map_background (EMap *view, gchar *name) static void -update_render_pixbuf (EMap *map, ArtFilterLevel interp, gboolean render_overlays) +update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays) { EMapPrivate *priv; EMapPoint *point; @@ -1661,9 +1660,8 @@ zoom_do (EMap *map) EMapPrivate *priv; priv = map->priv; - - gtk_signal_handler_block_by_data (GTK_OBJECT (priv->hadj), map); - gtk_signal_handler_block_by_data (GTK_OBJECT (priv->vadj), map); + g_signal_handlers_block_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); + g_signal_handlers_block_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); if (priv->zoom_state == E_MAP_ZOOMING_IN) { @@ -1676,8 +1674,8 @@ zoom_do (EMap *map) zoom_out (map); } - gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->hadj), map); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->vadj), map); + g_signal_handlers_unblock_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); + g_signal_handlers_unblock_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, map); set_scroll_area(map); } @@ -1728,8 +1726,8 @@ set_scroll_area (EMap *view) if (priv->map_render_pixbuf) priv->vadj->upper = gdk_pixbuf_get_height (priv->map_render_pixbuf); - gtk_signal_emit_by_name (GTK_OBJECT (priv->hadj), "changed"); - gtk_signal_emit_by_name (GTK_OBJECT (priv->vadj), "changed"); + g_signal_emit_by_name (priv->hadj, "changed"); + g_signal_emit_by_name (priv->vadj, "changed"); priv->xofs = CLAMP (priv->xofs, 0, priv->hadj->upper - priv->hadj->page_size); priv->yofs = CLAMP (priv->yofs, 0, priv->vadj->upper - priv->vadj->page_size); @@ -1738,17 +1736,17 @@ set_scroll_area (EMap *view) { priv->hadj->value = priv->xofs; - gtk_signal_handler_block_by_data (GTK_OBJECT (priv->hadj), view); - gtk_signal_emit_by_name (GTK_OBJECT (priv->hadj), "value_changed"); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->hadj), view); + g_signal_handlers_block_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); + g_signal_emit_by_name (priv->hadj, "value_changed"); + g_signal_handlers_unblock_matched (priv->hadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); } if (priv->vadj->value != priv->yofs) { priv->vadj->value = priv->yofs; - gtk_signal_handler_block_by_data (GTK_OBJECT (priv->vadj), view); - gtk_signal_emit_by_name (GTK_OBJECT (priv->vadj), "value_changed"); - gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv->vadj), view); + g_signal_handlers_block_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); + g_signal_emit_by_name (priv->vadj, "value_changed"); + g_signal_handlers_unblock_matched (priv->vadj, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, view); } } -- cgit v1.2.3