[maemo-commits] [maemo-commits] r15939 - in projects/haf/trunk/sapwood: . src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Tue Sep 2 14:29:12 EEST 2008
- Previous message: [maemo-commits] r15938 - in projects/haf/trunk/sapwood: . src
- Next message: [maemo-commits] r15940 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: herzi Date: 2008-09-02 14:29:03 +0300 (Tue, 02 Sep 2008) New Revision: 15939 Modified: projects/haf/trunk/sapwood/ChangeLog projects/haf/trunk/sapwood/src/sapwood-pixmap.c projects/haf/trunk/sapwood/src/sapwood-rc-style.c projects/haf/trunk/sapwood/src/sapwood-rc-style.h projects/haf/trunk/sapwood/src/sapwood-server.c projects/haf/trunk/sapwood/src/sapwood-style.c projects/haf/trunk/sapwood/src/sapwood-style.h projects/haf/trunk/sapwood/src/theme-pixbuf.c projects/haf/trunk/sapwood/src/theme-pixbuf.h Log: 2008-09-02 Sven Herzberg <sven at imendio.com> Drop trailing whitespaces based on a patch by Christian Dywan * src/sapwood-pixmap.c, * src/sapwood-rc-style.c, * src/sapwood-rc-style.h, * src/sapwood-server.c, * src/sapwood-style.c, * src/sapwood-style.h, * src/theme-pixbuf.c, * src/theme-pixbuf.h: drop trailing whitespaces Modified: projects/haf/trunk/sapwood/ChangeLog =================================================================== --- projects/haf/trunk/sapwood/ChangeLog 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/ChangeLog 2008-09-02 11:29:03 UTC (rev 15939) @@ -1,5 +1,19 @@ 2008-09-02 Sven Herzberg <sven at imendio.com> + Drop trailing whitespaces + based on a patch by Christian Dywan + + * src/sapwood-pixmap.c, + * src/sapwood-rc-style.c, + * src/sapwood-rc-style.h, + * src/sapwood-server.c, + * src/sapwood-style.c, + * src/sapwood-style.h, + * src/theme-pixbuf.c, + * src/theme-pixbuf.h: drop trailing whitespaces + +2008-09-02 Sven Herzberg <sven at imendio.com> + Let the filename match the name of the implemented class based on a patch by Christian Dywan Modified: projects/haf/trunk/sapwood/src/sapwood-pixmap.c =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-pixmap.c 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/src/sapwood-pixmap.c 2008-09-02 11:29:03 UTC (rev 15939) @@ -342,7 +342,7 @@ { if (!gdk_rectangle_intersect (dest, clip_rect, &area)) continue; - } + } else area = *dest; @@ -421,7 +421,7 @@ cairo_t *tmp_cr; cairo_t *cr; gint n; - + /* Don't even try to scale down shape masks (should never be useful, and * implementing would add some complexity.) Areas larger than the pixmap * can be tiled fine. Modified: projects/haf/trunk/sapwood/src/sapwood-rc-style.c =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-rc-style.c 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/src/sapwood-rc-style.c 2008-09-02 11:29:03 UTC (rev 15939) @@ -131,7 +131,7 @@ 0, /* n_preallocs */ (GInstanceInitFunc) sapwood_rc_style_init, }; - + sapwood_type_rc_style = g_type_module_register_type (module, GTK_TYPE_RC_STYLE, "SapwoodRcStyle", @@ -154,7 +154,7 @@ rc_style_class->parse = sapwood_rc_style_parse; rc_style_class->merge = sapwood_rc_style_merge; rc_style_class->create_style = sapwood_rc_style_create_style; - + object_class->finalize = sapwood_rc_style_finalize; } @@ -162,7 +162,7 @@ sapwood_rc_style_finalize (GObject *object) { SapwoodRcStyle *rc_style = SAPWOOD_RC_STYLE (object); - + g_list_foreach (rc_style->img_list, (GFunc) theme_image_unref, NULL); g_list_free (rc_style->img_list); @@ -254,9 +254,9 @@ if (!*theme_pb) *theme_pb = theme_pixbuf_new (); - + theme_pixbuf_set_border (*theme_pb, left, right, top, bottom); - + return G_TOKEN_NONE; } @@ -284,9 +284,9 @@ if (!*theme_pb) *theme_pb = theme_pixbuf_new (); - + theme_pixbuf_set_stretch (*theme_pb, stretch); - + return G_TOKEN_NONE; } @@ -331,7 +331,7 @@ if (data->match_data.detail) g_free (data->match_data.detail); - + data->match_data.detail = g_strdup(scanner->value.v_string); return G_TOKEN_NONE; @@ -405,7 +405,7 @@ return TOKEN_NORMAL; data->match_data.flags |= THEME_MATCH_STATE; - + return G_TOKEN_NONE; } @@ -438,7 +438,7 @@ return TOKEN_NONE; data->match_data.flags |= THEME_MATCH_SHADOW; - + return G_TOKEN_NONE; } @@ -469,7 +469,7 @@ return TOKEN_UP; data->match_data.flags |= THEME_MATCH_ARROW_DIRECTION; - + return G_TOKEN_NONE; } @@ -501,7 +501,7 @@ return TOKEN_TOP; data->match_data.flags |= THEME_MATCH_GAP_SIDE; - + return G_TOKEN_NONE; } @@ -529,7 +529,7 @@ return TOKEN_HORIZONTAL; data->match_data.flags |= THEME_MATCH_ORIENTATION; - + return G_TOKEN_NONE; } @@ -743,7 +743,6 @@ sapwood_rc_style_parse (GtkRcStyle *rc_style, GtkSettings *settings, GScanner *scanner) - { static GQuark scope_id = 0; SapwoodRcStyle *sapwood_style = SAPWOOD_RC_STYLE (rc_style); @@ -752,7 +751,7 @@ guint token; gint i; ThemeImage *img; - + /* Set up a new scope in this scanner. */ if (!scope_id) @@ -821,14 +820,14 @@ SapwoodRcStyle *pixbuf_dest = SAPWOOD_RC_STYLE (dest); SapwoodRcStyle *pixbuf_src = SAPWOOD_RC_STYLE (src); GList *tmp_list1, *tmp_list2; - + if (pixbuf_src->img_list) { /* Copy src image list and append to dest image list */ - + tmp_list2 = g_list_last (pixbuf_dest->img_list); tmp_list1 = pixbuf_src->img_list; - + while (tmp_list1) { if (tmp_list2) @@ -842,7 +841,7 @@ pixbuf_dest->img_list = g_list_append (NULL, tmp_list1->data); tmp_list2 = pixbuf_dest->img_list; } - + theme_image_ref (tmp_list1->data); tmp_list1 = tmp_list1->next; } Modified: projects/haf/trunk/sapwood/src/sapwood-rc-style.h =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-rc-style.h 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/src/sapwood-rc-style.h 2008-09-02 11:29:03 UTC (rev 15939) @@ -39,7 +39,7 @@ struct _SapwoodRcStyle { GtkRcStyle parent_instance; - + GList *img_list; }; Modified: projects/haf/trunk/sapwood/src/sapwood-server.c =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-server.c 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/src/sapwood-server.c 2008-09-02 11:29:03 UTC (rev 15939) @@ -178,11 +178,11 @@ y1 = height; break; } - + for (j = 0; j < 3; j++) { gint x0, x1; - + switch (j) { case 0: Modified: projects/haf/trunk/sapwood/src/sapwood-style.c =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-style.c 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/src/sapwood-style.c 2008-09-02 11:29:03 UTC (rev 15939) @@ -42,7 +42,7 @@ GList *tmp_list; tmp_list = SAPWOOD_RC_STYLE (style->rc_style)->img_list; - + while (tmp_list) { guint flags; @@ -53,7 +53,7 @@ continue; flags = match_data->flags & image->match_data.flags; - + if (flags != image->match_data.flags) /* Required components not present */ continue; @@ -68,7 +68,7 @@ if ((flags & THEME_MATCH_SHADOW) && match_data->shadow != image->match_data.shadow) continue; - + if ((flags & THEME_MATCH_ARROW_DIRECTION) && match_data->arrow_direction != image->match_data.arrow_direction) continue; @@ -100,7 +100,7 @@ return image; } - + return NULL; } @@ -163,7 +163,7 @@ if (!GTK_WIDGET_DRAWABLE (widget)) continue; - + /* XXX Should we consider the lower right corner instead, for * right/bottom? */ @@ -229,7 +229,7 @@ { gboolean maemo_position_theming; ThemeImage *image; - + if ((width == -1) && (height == -1)) gdk_drawable_get_size (window, &width, &height); else if (width == -1) @@ -240,7 +240,7 @@ if (!(match_data->flags & THEME_MATCH_ORIENTATION)) { match_data->flags |= THEME_MATCH_ORIENTATION; - + if (height > width) match_data->orientation = GTK_ORIENTATION_VERTICAL; else @@ -270,7 +270,7 @@ } } } - + image = match_theme_image (style, match_data); if (image) { @@ -297,7 +297,7 @@ g_object_unref (mask); } } - + if (image->overlay && draw_center) theme_pixbuf_render (image->overlay, widget, window, NULL, area, COMPONENT_ALL, @@ -326,7 +326,7 @@ gint gap_width) { ThemeImage *image; - + if ((width == -1) && (height == -1)) gdk_drawable_get_size (window, &width, &height); else if (width == -1) @@ -337,7 +337,7 @@ if (!(match_data->flags & THEME_MATCH_ORIENTATION)) { match_data->flags |= THEME_MATCH_ORIENTATION; - + if (height > width) match_data->orientation = GTK_ORIENTATION_VERTICAL; else @@ -346,7 +346,7 @@ match_data->flags |= THEME_MATCH_GAP_SIDE; match_data->gap_side = gap_side; - + image = match_theme_image (style, match_data); if (image) { @@ -382,7 +382,7 @@ r3.width = width - (gap_x + gap_width); r3.height = ythickness; break; - + case GTK_POS_BOTTOM: if (!draw_center) components |= COMPONENT_SOUTH_WEST | COMPONENT_SOUTH | COMPONENT_SOUTH_EAST; @@ -400,7 +400,7 @@ r3.width = width - (gap_x + gap_width); r3.height = ythickness; break; - + case GTK_POS_LEFT: if (!draw_center) components |= COMPONENT_NORTH_WEST | COMPONENT_WEST | COMPONENT_SOUTH_WEST; @@ -418,7 +418,7 @@ r3.width = xthickness; r3.height = height - (gap_x + gap_width); break; - + case GTK_POS_RIGHT: if (!draw_center) components |= COMPONENT_NORTH_EAST | COMPONENT_EAST | COMPONENT_SOUTH_EAST; @@ -474,7 +474,7 @@ { ThemeImage *image; ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -483,7 +483,7 @@ match_data.flags = THEME_MATCH_ORIENTATION | THEME_MATCH_STATE; match_data.state = state; match_data.orientation = GTK_ORIENTATION_HORIZONTAL; - + image = match_theme_image (style, &match_data); if (image) { @@ -510,7 +510,7 @@ { ThemeImage *image; ThemeMatchData match_data; - + g_return_if_fail (style != NULL); g_return_if_fail (window != NULL); @@ -519,7 +519,7 @@ match_data.flags = THEME_MATCH_ORIENTATION | THEME_MATCH_STATE; match_data.state = state; match_data.orientation = GTK_ORIENTATION_VERTICAL; - + image = match_theme_image (style, &match_data); if (image) { @@ -547,7 +547,7 @@ gint height) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -581,7 +581,7 @@ gint slider_width = 14, stepper_size = 14; gint box_width; gint box_height; - + if (range) { gtk_widget_style_get (range, @@ -589,7 +589,7 @@ "stepper_size", &stepper_size, NULL); } - + if (arrow_type == GTK_ARROW_UP || arrow_type == GTK_ARROW_DOWN) { box_width = slider_width; @@ -623,7 +623,7 @@ gint height) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -656,7 +656,7 @@ match_data.shadow = shadow; match_data.state = state; match_data.arrow_direction = arrow_direction; - + if (draw_simple_image (style, window, area, widget, &match_data, TRUE, box_x, box_y, box_width, box_height)) { @@ -671,7 +671,7 @@ match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE; match_data.shadow = shadow; match_data.state = state; - + if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, box_x, box_y, box_width, box_height)) parent_class->draw_box (style, window, state, shadow, area, widget, detail, @@ -691,7 +691,7 @@ match_data.shadow = shadow; match_data.state = state; match_data.arrow_direction = arrow_direction; - + if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, x, y, width, height)) parent_class->draw_arrow (style, window, state, shadow, area, widget, detail, @@ -712,7 +712,7 @@ gint height) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -721,7 +721,7 @@ match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE; match_data.shadow = shadow; match_data.state = state; - + if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, x, y, width, height)) parent_class->draw_diamond (style, window, state, shadow, area, widget, detail, @@ -751,7 +751,7 @@ } gdk_draw_string(window, gtk_style_get_font (style), style->fg_gc[state], x, y, string); - + if (area) { gdk_gc_set_clip_rectangle(style->white_gc, NULL); @@ -900,7 +900,7 @@ gint height) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -934,7 +934,7 @@ gint height) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -972,7 +972,7 @@ gint height) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -981,7 +981,7 @@ match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE; match_data.shadow = shadow; match_data.state = state; - + /* Special casing for GtkRadioButton: We want to set the widget state to * ACTIVE to get the correct graphics used in the RC files. Ideally we'd * use the FOCUS rules, but this is not possible due to technical limitations @@ -1010,7 +1010,7 @@ gint height) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -1043,7 +1043,7 @@ gint gap_width) { ThemeMatchData match_data; - + match_data.function = TOKEN_D_SHADOW_GAP; match_data.detail = (gchar *)detail; match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE; @@ -1052,7 +1052,7 @@ THEME_MATCH_ORIENTATION); match_data.shadow = shadow; match_data.state = state; - + if (!draw_gap_image (style, window, area, widget, &match_data, FALSE, x, y, width, height, gap_side, gap_x, gap_width)) parent_class->draw_shadow_gap (style, window, state, shadow, area, widget, detail, @@ -1076,7 +1076,7 @@ gint gap_width) { ThemeMatchData match_data; - + match_data.function = TOKEN_D_BOX_GAP; match_data.detail = (gchar *)detail; match_data.flags = THEME_MATCH_SHADOW | THEME_MATCH_STATE; @@ -1085,7 +1085,7 @@ THEME_MATCH_ORIENTATION); match_data.shadow = shadow; match_data.state = state; - + if (!draw_gap_image (style, window, area, widget, &match_data, TRUE, x, y, width, height, gap_side, gap_x, gap_width)) parent_class->draw_box_gap (style, window, state, shadow, area, widget, detail, @@ -1157,7 +1157,7 @@ GtkPositionType gap_side) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -1187,7 +1187,7 @@ gint height) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -1195,7 +1195,7 @@ match_data.detail = (gchar *)detail; match_data.flags = THEME_MATCH_STATE; match_data.state = state; - + if (!draw_simple_image (style, window, area, widget, &match_data, TRUE, x, y, width, height)) parent_class->draw_focus (style, window, state, area, widget, detail, @@ -1217,7 +1217,7 @@ GtkOrientation orientation) { ThemeMatchData match_data; - + g_return_if_fail(style != NULL); g_return_if_fail(window != NULL); @@ -1252,7 +1252,7 @@ GtkOrientation orientation) { ThemeMatchData match_data; - + g_return_if_fail (style != NULL); g_return_if_fail (window != NULL); Modified: projects/haf/trunk/sapwood/src/sapwood-style.h =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-style.h 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/src/sapwood-style.h 2008-09-02 11:29:03 UTC (rev 15939) @@ -47,5 +47,3 @@ }; void sapwood_style_register_type (GTypeModule *module) G_GNUC_INTERNAL; - - Modified: projects/haf/trunk/sapwood/src/theme-pixbuf.c =================================================================== --- projects/haf/trunk/sapwood/src/theme-pixbuf.c 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/src/theme-pixbuf.c 2008-09-02 11:29:03 UTC (rev 15939) @@ -334,7 +334,7 @@ \ n_rect++; \ } while(0) - + n_rect = 0; if (component_mask & COMPONENT_NORTH_WEST) RENDER_COMPONENT (0, 0); if (component_mask & COMPONENT_NORTH) RENDER_COMPONENT (1, 0); Modified: projects/haf/trunk/sapwood/src/theme-pixbuf.h =================================================================== --- projects/haf/trunk/sapwood/src/theme-pixbuf.h 2008-09-02 10:01:01 UTC (rev 15938) +++ projects/haf/trunk/sapwood/src/theme-pixbuf.h 2008-09-02 11:29:03 UTC (rev 15939) @@ -169,7 +169,7 @@ ThemePixbuf *gap_start; ThemePixbuf *gap; ThemePixbuf *gap_end; - + ThemeMatchData match_data; guint refcount : 31; @@ -206,5 +206,4 @@ gint dest_height) G_GNUC_INTERNAL; - extern GtkStyleClass pixmap_default_class G_GNUC_INTERNAL;
- Previous message: [maemo-commits] r15938 - in projects/haf/trunk/sapwood: . src
- Next message: [maemo-commits] r15940 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]