[maemo-commits] [maemo-commits] r15976 - in projects/haf/trunk/sapwood: . src
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Sep 3 11:46:29 EEST 2008
- Previous message: [maemo-commits] r15975 - projects/haf/branches/hildon-thumbnail/daemonize/daemon
- Next message: [maemo-commits] r15977 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: herzi Date: 2008-09-03 11:46:24 +0300 (Wed, 03 Sep 2008) New Revision: 15976 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-style.c projects/haf/trunk/sapwood/src/theme-pixbuf.c Log: 2008-09-03 Sven Herzberg <sven at imendio.com> Properly indent function signatures based on a patch by Christian Dywan * src/sapwood-pixmap.c, * src/sapwood-rc-style.c, * src/sapwood-rc-style.h, * src/sapwood-style.c, * src/theme-pixbuf.c: properly indent function signatures Modified: projects/haf/trunk/sapwood/ChangeLog =================================================================== --- projects/haf/trunk/sapwood/ChangeLog 2008-09-02 16:44:00 UTC (rev 15975) +++ projects/haf/trunk/sapwood/ChangeLog 2008-09-03 08:46:24 UTC (rev 15976) @@ -1,3 +1,14 @@ +2008-09-03 Sven Herzberg <sven at imendio.com> + + Properly indent function signatures + based on a patch by Christian Dywan + + * src/sapwood-pixmap.c, + * src/sapwood-rc-style.c, + * src/sapwood-rc-style.h, + * src/sapwood-style.c, + * src/theme-pixbuf.c: properly indent function signatures + 2008-09-02 Sven Herzberg <sven at imendio.com> Added a space before opening parenthesis Modified: projects/haf/trunk/sapwood/src/sapwood-pixmap.c =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-pixmap.c 2008-09-02 16:44:00 UTC (rev 15975) +++ projects/haf/trunk/sapwood/src/sapwood-pixmap.c 2008-09-03 08:46:24 UTC (rev 15976) @@ -87,9 +87,11 @@ } static gboolean -pixbuf_proto_request (const char *req, ssize_t reqlen, - char *rep, ssize_t replen, - GError **err) +pixbuf_proto_request (const char *req, + ssize_t reqlen, + char *rep, + ssize_t replen, + GError **err) { static int fd = -1; ssize_t n; @@ -139,11 +141,11 @@ SapwoodPixmap * sapwood_pixmap_get_for_file (const char *filename, - int border_left, - int border_right, - int border_top, - int border_bottom, - GError **err) + int border_left, + int border_right, + int border_top, + int border_bottom, + GError **err) { SapwoodPixmap *self; char buf[ sizeof(PixbufOpenRequest) + PATH_MAX + 1 ] = {0}; @@ -279,8 +281,8 @@ gboolean sapwood_pixmap_get_geometry (SapwoodPixmap *self, - gint *width, - gint *height) + gint *width, + gint *height) { if (!self) return FALSE; @@ -294,8 +296,11 @@ } void -sapwood_pixmap_get_pixmap (SapwoodPixmap *self, gint x, gint y, - GdkPixmap **pixmap, GdkBitmap **pixmask) +sapwood_pixmap_get_pixmap (SapwoodPixmap *self, + gint x, + gint y, + GdkPixmap **pixmap, + GdkBitmap **pixmask) { *pixmap = self->pixmap[y][x]; *pixmask = self->pixmask[y][x]; Modified: projects/haf/trunk/sapwood/src/sapwood-rc-style.c =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-rc-style.c 2008-09-02 16:44:00 UTC (rev 15975) +++ projects/haf/trunk/sapwood/src/sapwood-rc-style.c 2008-09-03 08:46:24 UTC (rev 15976) @@ -170,9 +170,9 @@ } static guint -theme_parse_file(GtkSettings *settings, - GScanner *scanner, - ThemePixbuf **theme_pb) +theme_parse_file (GtkSettings *settings, + GScanner *scanner, + ThemePixbuf **theme_pb) { guint token; gchar *pixmap; @@ -261,8 +261,8 @@ } static guint -theme_parse_stretch(GScanner *scanner, - ThemePixbuf **theme_pb) +theme_parse_stretch (GScanner *scanner, + ThemePixbuf **theme_pb) { guint token; gboolean stretch; @@ -291,8 +291,8 @@ } static guint -theme_parse_function(GScanner * scanner, - ThemeImage *data) +theme_parse_function (GScanner *scanner, + ThemeImage *data) { guint token; @@ -312,10 +312,10 @@ } static guint -theme_parse_detail(GScanner * scanner, - ThemeImage * data) +theme_parse_detail (GScanner *scanner, + ThemeImage *data) { - guint token; + guint token; token = g_scanner_get_next_token (scanner); if (token != TOKEN_DETAIL) @@ -338,8 +338,8 @@ } static guint -theme_parse_position(GScanner * scanner, - ThemeImage * data) +theme_parse_position (GScanner *scanner, + ThemeImage *data) { guint token; @@ -377,8 +377,8 @@ } static guint -theme_parse_state(GScanner * scanner, - ThemeImage * data) +theme_parse_state (GScanner *scanner, + ThemeImage *data) { guint token; @@ -410,10 +410,10 @@ } static guint -theme_parse_shadow(GScanner * scanner, - ThemeImage * data) +theme_parse_shadow (GScanner *scanner, + ThemeImage *data) { - guint token; + guint token; token = g_scanner_get_next_token (scanner); if (token != TOKEN_SHADOW) @@ -443,8 +443,8 @@ } static guint -theme_parse_arrow_direction(GScanner * scanner, - ThemeImage * data) +theme_parse_arrow_direction (GScanner *scanner, + ThemeImage *data) { guint token; @@ -474,8 +474,8 @@ } static guint -theme_parse_gap_side(GScanner * scanner, - ThemeImage * data) +theme_parse_gap_side (GScanner *scanner, + ThemeImage *data) { guint token; @@ -506,8 +506,8 @@ } static guint -theme_parse_orientation(GScanner * scanner, - ThemeImage * data) +theme_parse_orientation (GScanner *scanner, + ThemeImage *data) { guint token; @@ -534,10 +534,10 @@ } static guint -theme_parse_shaped(GScanner * scanner, - ThemeImage * data) +theme_parse_shaped (GScanner *scanner, + ThemeImage *data) { - guint token; + guint token; gboolean shaped; token = g_scanner_get_next_token (scanner); @@ -590,7 +590,9 @@ } static void -validate_pixbuf (GScanner *scanner, ThemePixbuf **theme_pb, const char *name) +validate_pixbuf (GScanner *scanner, + ThemePixbuf **theme_pb, + const char *name) { if (!*theme_pb) return; @@ -615,12 +617,12 @@ } static guint -theme_parse_image(GtkSettings *settings, - GScanner *scanner, - SapwoodRcStyle *sapwood_style, - ThemeImage **data_return) +theme_parse_image (GtkSettings *settings, + GScanner *scanner, + SapwoodRcStyle *sapwood_style, + ThemeImage **data_return) { - guint token; + guint token; ThemeImage *data; data = NULL; @@ -740,9 +742,9 @@ } static guint -sapwood_rc_style_parse (GtkRcStyle *rc_style, - GtkSettings *settings, - GScanner *scanner) +sapwood_rc_style_parse (GtkRcStyle *rc_style, + GtkSettings *settings, + GScanner *scanner) { static GQuark scope_id = 0; SapwoodRcStyle *sapwood_style = SAPWOOD_RC_STYLE (rc_style); @@ -789,7 +791,7 @@ token = theme_parse_image (settings, scanner, sapwood_style, &img); break; default: - g_scanner_get_next_token(scanner); + g_scanner_get_next_token (scanner); token = G_TOKEN_RIGHT_CURLY; break; } Modified: projects/haf/trunk/sapwood/src/sapwood-rc-style.h =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-rc-style.h 2008-09-02 16:44:00 UTC (rev 15975) +++ projects/haf/trunk/sapwood/src/sapwood-rc-style.h 2008-09-03 08:46:24 UTC (rev 15976) @@ -22,7 +22,7 @@ * Carsten Haitzler <raster at rasterman.com> */ -#include <gtk/gtkrc.h> +#include <gtk/gtk.h> typedef struct _SapwoodRcStyle SapwoodRcStyle; typedef struct _SapwoodRcStyleClass SapwoodRcStyleClass; Modified: projects/haf/trunk/sapwood/src/sapwood-style.c =================================================================== --- projects/haf/trunk/sapwood/src/sapwood-style.c 2008-09-02 16:44:00 UTC (rev 15975) +++ projects/haf/trunk/sapwood/src/sapwood-style.c 2008-09-03 08:46:24 UTC (rev 15976) @@ -105,8 +105,13 @@ } static GdkBitmap * -get_window_for_shape (ThemeImage *image, GdkWindow *window, GtkWidget *widget, - gint x, gint y, gint width, gint height) +get_window_for_shape (ThemeImage *image, + GdkWindow *window, + GtkWidget *widget, + gint x, + gint y, + gint width, + gint height) { /* It's not a good idea to set a shape mask when painting on anything but * widget->window, not only does the shape mask get wrongly offset but also @@ -190,7 +195,8 @@ } static void -check_buttonbox_child_position (GtkWidget *child, ThemeMatchData *match_data) +check_buttonbox_child_position (GtkWidget *child, + ThemeMatchData *match_data) { GList *children = NULL; GList *l; @@ -216,16 +222,16 @@ } static gboolean -draw_simple_image(GtkStyle *style, - GdkWindow *window, - GdkRectangle *area, - GtkWidget *widget, - ThemeMatchData *match_data, - gboolean draw_center, - gint x, - gint y, - gint width, - gint height) +draw_simple_image (GtkStyle *style, + GdkWindow *window, + GdkRectangle *area, + GtkWidget *widget, + ThemeMatchData *match_data, + gboolean draw_center, + gint x, + gint y, + gint width, + gint height) { gboolean maemo_position_theming; ThemeImage *image; @@ -311,19 +317,19 @@ } static gboolean -draw_gap_image(GtkStyle *style, - GdkWindow *window, - GdkRectangle *area, - GtkWidget *widget, - ThemeMatchData *match_data, - gboolean draw_center, - gint x, - gint y, - gint width, - gint height, - GtkPositionType gap_side, - gint gap_x, - gint gap_width) +draw_gap_image (GtkStyle *style, + GdkWindow *window, + GdkRectangle *area, + GtkWidget *widget, + ThemeMatchData *match_data, + gboolean draw_center, + gint x, + gint y, + gint width, + gint height, + GtkPositionType gap_side, + gint gap_x, + gint gap_width) { ThemeImage *image; @@ -534,17 +540,17 @@ } static void -draw_shadow(GtkStyle *style, - GdkWindow *window, - GtkStateType state, - GtkShadowType shadow, - GdkRectangle *area, - GtkWidget *widget, - const gchar *detail, - gint x, - gint y, - gint width, - gint height) +draw_shadow (GtkStyle *style, + GdkWindow *window, + GtkStateType state, + GtkShadowType shadow, + GdkRectangle *area, + GtkWidget *widget, + const gchar *detail, + gint x, + gint y, + gint width, + gint height) { ThemeMatchData match_data; @@ -729,15 +735,15 @@ } static void -draw_string (GtkStyle * style, - GdkWindow * window, - GtkStateType state, - GdkRectangle * area, - GtkWidget * widget, - const gchar *detail, - gint x, - gint y, - const gchar * string) +draw_string (GtkStyle *style, + GdkWindow *window, + GtkStateType state, + GdkRectangle *area, + GtkWidget *widget, + const gchar *detail, + gint x, + gint y, + const gchar *string) { g_return_if_fail (style != NULL); g_return_if_fail (window != NULL); @@ -769,7 +775,8 @@ } static void -maybe_check_submenu_state (GtkMenuItem *menu_item, ThemeMatchData *match_data) +maybe_check_submenu_state (GtkMenuItem *menu_item, + ThemeMatchData *match_data) { /* Distinguish between active and passive focus, depending on whether the * focus is in submenu. @@ -843,7 +850,10 @@ static void maybe_check_cursor_position (GtkTreeView *treeview, - gint x, gint y, gint width, gint height, + gint x, + gint y, + gint width, + gint height, ThemeMatchData *match_data) { GtkTreePath *cursor_path; Modified: projects/haf/trunk/sapwood/src/theme-pixbuf.c =================================================================== --- projects/haf/trunk/sapwood/src/theme-pixbuf.c 2008-09-02 16:44:00 UTC (rev 15975) +++ projects/haf/trunk/sapwood/src/theme-pixbuf.c 2008-09-03 08:46:24 UTC (rev 15976) @@ -94,7 +94,8 @@ } static gboolean -theme_pixbuf_equal (gconstpointer v1, gconstpointer v2) +theme_pixbuf_equal (gconstpointer v1, + gconstpointer v2) { const ThemePixbuf *a = v1; const ThemePixbuf *b = v2; @@ -107,7 +108,8 @@ } ThemePixbuf * -theme_pixbuf_canonicalize (ThemePixbuf *theme_pb, gboolean *warn) +theme_pixbuf_canonicalize (ThemePixbuf *theme_pb, + gboolean *warn) { ThemePixbuf *canon;
- Previous message: [maemo-commits] r15975 - projects/haf/branches/hildon-thumbnail/daemonize/daemon
- Next message: [maemo-commits] r15977 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]