[libchamplain] Correct coding style
- From: Pierre-Luc Beaudoin <plbeaudoin src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libchamplain] Correct coding style
- Date: Sun, 24 Jan 2010 20:15:32 +0000 (UTC)
commit f863aa689edafdeef41bd9e74e60dcff2c5bffa0
Author: JiÅ?Ã Techet <techet gmail com>
Date: Fri Jan 22 00:57:00 2010 +0100
Correct coding style
Correct coding style of mine, in fact, quite automatically:
sed -i 's/\([a-z0-9]\)(/\1 (/g' *.h *.c
Signed-off-by: JiÅ?Ã Techet <techet gmail com>
champlain/champlain-error-tile-source.c | 2 +-
champlain/champlain-file-cache.c | 100 ++++++++++++++--------------
champlain/champlain-map-source-chain.c | 50 +++++++-------
champlain/champlain-map-source-chain.h | 4 +-
champlain/champlain-map-source-factory.c | 12 ++--
champlain/champlain-map-source.c | 14 ++--
champlain/champlain-memphis-tile-source.c | 56 ++++++++--------
champlain/champlain-network-tile-source.c | 28 ++++----
champlain/champlain-tile-cache.c | 28 ++++----
champlain/champlain-tile-source.c | 8 +-
demos/local-rendering.c | 26 ++++----
11 files changed, 164 insertions(+), 164 deletions(-)
---
diff --git a/champlain/champlain-error-tile-source.c b/champlain/champlain-error-tile-source.c
index 918e90a..05c9211 100644
--- a/champlain/champlain-error-tile-source.c
+++ b/champlain/champlain-error-tile-source.c
@@ -80,7 +80,7 @@ fill_tile (ChamplainMapSource *map_source, ChamplainTile *tile)
ClutterActor *clone;
guint size;
- if (champlain_tile_get_content(tile))
+ if (champlain_tile_get_content (tile))
/* cache is just validating tile - don't generate error tile in this case */
return;
diff --git a/champlain/champlain-file-cache.c b/champlain/champlain-file-cache.c
index 209c631..c534cf1 100644
--- a/champlain/champlain-file-cache.c
+++ b/champlain/champlain-file-cache.c
@@ -53,7 +53,7 @@ struct _ChamplainFileCachePrivate
sqlite3_stmt *stmt_update;
};
-static void finalize_sql(ChamplainFileCache *file_cache);
+static void finalize_sql (ChamplainFileCache *file_cache);
static void delete_temp_cache (ChamplainFileCache *file_cache);
static void init_cache (ChamplainFileCache *file_cache);
static gchar *get_filename (ChamplainFileCache *file_cache, ChamplainTile *tile);
@@ -122,7 +122,7 @@ champlain_file_cache_dispose (GObject *object)
}
static void
-finalize_sql(ChamplainFileCache *file_cache)
+finalize_sql (ChamplainFileCache *file_cache)
{
ChamplainFileCachePrivate *priv = GET_PRIVATE (file_cache);
gint error;
@@ -154,7 +154,7 @@ delete_temp_cache (ChamplainFileCache *file_cache)
ChamplainTileCache *tile_cache = CHAMPLAIN_TILE_CACHE(file_cache);
ChamplainFileCachePrivate *priv = GET_PRIVATE(file_cache);
- if (!champlain_tile_cache_get_persistent(tile_cache) && priv->real_cache_dir)
+ if (!champlain_tile_cache_get_persistent (tile_cache) && priv->real_cache_dir)
{
GFile *file = NULL;
@@ -179,11 +179,11 @@ champlain_file_cache_finalize (GObject *object)
finalize_sql (file_cache);
- if (!champlain_tile_cache_get_persistent(tile_cache))
- delete_temp_cache(file_cache);
+ if (!champlain_tile_cache_get_persistent (tile_cache))
+ delete_temp_cache (file_cache);
- g_free(priv->real_cache_dir);
- g_free(priv->cache_dir);
+ g_free (priv->real_cache_dir);
+ g_free (priv->cache_dir);
G_OBJECT_CLASS (champlain_file_cache_parent_class)->finalize (object);
}
@@ -208,8 +208,8 @@ init_cache (ChamplainFileCache *file_cache)
}
}
- if (champlain_tile_cache_get_persistent(tile_cache))
- priv->real_cache_dir = g_strdup(priv->cache_dir);
+ if (champlain_tile_cache_get_persistent (tile_cache))
+ priv->real_cache_dir = g_strdup (priv->cache_dir);
else
{
/* Create temporary directory for non-persistent caches */
@@ -220,12 +220,12 @@ init_cache (ChamplainFileCache *file_cache)
else
tmplate = g_build_filename (g_get_tmp_dir (), "champlain-XXXXXX", NULL);
- priv->real_cache_dir = mkdtemp(tmplate);
+ priv->real_cache_dir = mkdtemp (tmplate);
if (!priv->real_cache_dir)
{
g_warning ("Filed to create filename for temporary cache");
- g_free(tmplate);
+ g_free (tmplate);
}
}
@@ -298,7 +298,7 @@ champlain_file_cache_constructed (GObject *object)
{
ChamplainFileCache *file_cache = CHAMPLAIN_FILE_CACHE(object);
- init_cache(file_cache);
+ init_cache (file_cache);
G_OBJECT_CLASS (champlain_file_cache_parent_class)->constructed (object);
}
@@ -365,7 +365,7 @@ ChamplainFileCache* champlain_file_cache_new (void)
cache_path = g_build_path (G_DIR_SEPARATOR_S, g_get_user_cache_dir (), "champlain", NULL);
cache = g_object_new (CHAMPLAIN_TYPE_FILE_CACHE, "size-limit", 100000000,
"cache-dir", cache_path, "persistent-cache", TRUE, NULL);
- g_free(cache_path);
+ g_free (cache_path);
return cache;
}
@@ -382,7 +382,7 @@ ChamplainFileCache* champlain_file_cache_new_full (guint size_limit,
guint
champlain_file_cache_get_size_limit (ChamplainFileCache *file_cache)
{
- g_return_val_if_fail(CHAMPLAIN_IS_FILE_CACHE (file_cache), 0);
+ g_return_val_if_fail (CHAMPLAIN_IS_FILE_CACHE (file_cache), 0);
ChamplainFileCachePrivate *priv = GET_PRIVATE (file_cache);
return priv->size_limit;
@@ -415,8 +415,8 @@ get_filename (ChamplainFileCache *file_cache, ChamplainTile *tile)
ChamplainFileCachePrivate *priv = GET_PRIVATE (file_cache);
g_return_val_if_fail (CHAMPLAIN_IS_FILE_CACHE (file_cache), NULL);
- g_return_val_if_fail(CHAMPLAIN_IS_TILE (tile), NULL);
- g_return_val_if_fail(priv->real_cache_dir, NULL);
+ g_return_val_if_fail (CHAMPLAIN_IS_TILE (tile), NULL);
+ g_return_val_if_fail (priv->real_cache_dir, NULL);
ChamplainMapSource* map_source = CHAMPLAIN_MAP_SOURCE(file_cache);
@@ -435,8 +435,8 @@ get_filename (ChamplainFileCache *file_cache, ChamplainTile *tile)
static gboolean
tile_is_expired (ChamplainFileCache *file_cache, ChamplainTile *tile)
{
- g_return_val_if_fail(CHAMPLAIN_FILE_CACHE (file_cache), FALSE);
- g_return_val_if_fail(CHAMPLAIN_TILE (tile), FALSE);
+ g_return_val_if_fail (CHAMPLAIN_FILE_CACHE (file_cache), FALSE);
+ g_return_val_if_fail (CHAMPLAIN_TILE (tile), FALSE);
GTimeVal now = {0, };
const GTimeVal *modified_time = champlain_tile_get_modified_time (tile);
@@ -458,11 +458,11 @@ static void
fill_tile (ChamplainMapSource *map_source,
ChamplainTile *tile)
{
- g_return_if_fail(CHAMPLAIN_IS_FILE_CACHE (map_source));
- g_return_if_fail(CHAMPLAIN_IS_TILE (tile));
+ g_return_if_fail (CHAMPLAIN_IS_FILE_CACHE (map_source));
+ g_return_if_fail (CHAMPLAIN_IS_TILE (tile));
ChamplainFileCache *file_cache = CHAMPLAIN_FILE_CACHE(map_source);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
ChamplainFileCachePrivate *priv = GET_PRIVATE (file_cache);
GFileInfo *info = NULL;
GFile *file = NULL;
@@ -483,7 +483,7 @@ fill_tile (ChamplainMapSource *map_source,
if (actor)
{
champlain_tile_set_content (tile, actor, FALSE);
- champlain_tile_set_size (tile, champlain_map_source_get_tile_size(map_source));
+ champlain_tile_set_size (tile, champlain_map_source_get_tile_size (map_source));
}
else
{
@@ -509,7 +509,7 @@ fill_tile (ChamplainMapSource *map_source,
/* Notify other caches that the tile has been filled */
if (CHAMPLAIN_IS_TILE_CACHE(next_source))
{
- on_tile_filled(CHAMPLAIN_TILE_CACHE(next_source), tile);
+ on_tile_filled (CHAMPLAIN_TILE_CACHE(next_source), tile);
}
if (tile_is_expired (file_cache, tile))
@@ -556,16 +556,16 @@ fill_tile (ChamplainMapSource *map_source,
load_next:
if (CHAMPLAIN_IS_MAP_SOURCE(next_source))
- champlain_map_source_fill_tile(next_source, tile);
+ champlain_map_source_fill_tile (next_source, tile);
/* if we have some content, use the tile even if it wasn't validated */
- if (champlain_tile_get_content(tile) &&
- champlain_tile_get_state(tile) != CHAMPLAIN_STATE_DONE)
+ if (champlain_tile_get_content (tile) &&
+ champlain_tile_get_state (tile) != CHAMPLAIN_STATE_DONE)
champlain_tile_set_state (tile, CHAMPLAIN_STATE_DONE);
cleanup:
sqlite3_reset (priv->stmt_select);
- g_free(filename);
+ g_free (filename);
}
static void
@@ -574,7 +574,7 @@ refresh_tile_time (ChamplainTileCache *tile_cache, ChamplainTile *tile)
g_return_if_fail (CHAMPLAIN_IS_FILE_CACHE (tile_cache));
ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE(tile_cache);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
ChamplainFileCache *file_cache = CHAMPLAIN_FILE_CACHE(tile_cache);
gchar *filename = NULL;
GFile *file;
@@ -602,7 +602,7 @@ refresh_tile_time (ChamplainTileCache *tile_cache, ChamplainTile *tile)
if (CHAMPLAIN_IS_TILE_CACHE(next_source))
{
- refresh_tile_time(CHAMPLAIN_TILE_CACHE(next_source), tile);
+ refresh_tile_time (CHAMPLAIN_TILE_CACHE(next_source), tile);
}
}
@@ -615,7 +615,7 @@ store_tile (ChamplainTileCache *tile_cache,
g_return_if_fail (CHAMPLAIN_IS_FILE_CACHE (tile_cache));
ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE(tile_cache);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
ChamplainFileCache *file_cache = CHAMPLAIN_FILE_CACHE(tile_cache);
ChamplainFileCachePrivate *priv = GET_PRIVATE (file_cache);
gchar *query = NULL;
@@ -630,10 +630,10 @@ store_tile (ChamplainTileCache *tile_cache,
DEBUG ("Update of %p", tile);
filename = get_filename (file_cache, tile);
- file = g_file_new_for_path(filename);
+ file = g_file_new_for_path (filename);
/* If the file exists, delete it */
- g_file_delete(file, NULL, NULL);
+ g_file_delete (file, NULL, NULL);
/* If needed, create the cache's dirs */
path = g_path_get_dirname (filename);
@@ -647,7 +647,7 @@ store_tile (ChamplainTileCache *tile_cache,
}
}
- ostream = g_file_create(file, G_FILE_CREATE_PRIVATE, NULL, &gerror);
+ ostream = g_file_create (file, G_FILE_CREATE_PRIVATE, NULL, &gerror);
if (!ostream)
{
DEBUG ("GFileOutputStream creation failed: %s", gerror->message);
@@ -656,15 +656,15 @@ store_tile (ChamplainTileCache *tile_cache,
}
/* Write the cache */
- if (!g_output_stream_write_all(G_OUTPUT_STREAM(ostream), contents, size, &bytes_written, NULL, &gerror))
+ if (!g_output_stream_write_all (G_OUTPUT_STREAM(ostream), contents, size, &bytes_written, NULL, &gerror))
{
DEBUG ("Writing file contents failed: %s", gerror->message);
g_error_free (gerror);
- g_object_unref(ostream);
+ g_object_unref (ostream);
goto store_next;
}
- g_object_unref(ostream);
+ g_object_unref (ostream);
query = sqlite3_mprintf ("REPLACE INTO tiles (filename, etag, size) VALUES (%Q, %Q, %d)",
filename,
@@ -681,22 +681,22 @@ store_tile (ChamplainTileCache *tile_cache,
store_next:
if (CHAMPLAIN_IS_TILE_CACHE(next_source))
{
- store_tile(CHAMPLAIN_TILE_CACHE(next_source), tile, contents, size);
+ store_tile (CHAMPLAIN_TILE_CACHE(next_source), tile, contents, size);
}
- g_free(filename);
- g_free(path);
- g_object_unref(file);
+ g_free (filename);
+ g_free (path);
+ g_object_unref (file);
}
static void
on_tile_filled (ChamplainTileCache *tile_cache, ChamplainTile *tile)
{
- g_return_if_fail(CHAMPLAIN_IS_FILE_CACHE (tile_cache));
- g_return_if_fail(CHAMPLAIN_IS_TILE (tile));
+ g_return_if_fail (CHAMPLAIN_IS_FILE_CACHE (tile_cache));
+ g_return_if_fail (CHAMPLAIN_IS_TILE (tile));
ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE(tile_cache);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
ChamplainFileCache *file_cache = CHAMPLAIN_FILE_CACHE(tile_cache);
ChamplainFileCachePrivate *priv = GET_PRIVATE (file_cache);
int sql_rc = SQLITE_OK;
@@ -724,27 +724,27 @@ on_tile_filled (ChamplainTileCache *tile_cache, ChamplainTile *tile)
call_next:
if (CHAMPLAIN_IS_TILE_CACHE(next_source))
{
- on_tile_filled(CHAMPLAIN_TILE_CACHE(next_source), tile);
+ on_tile_filled (CHAMPLAIN_TILE_CACHE(next_source), tile);
}
}
static void
clean (ChamplainTileCache *tile_cache)
{
- g_return_if_fail(CHAMPLAIN_IS_FILE_CACHE (tile_cache));
+ g_return_if_fail (CHAMPLAIN_IS_FILE_CACHE (tile_cache));
ChamplainFileCache *file_cache = CHAMPLAIN_FILE_CACHE(tile_cache);
ChamplainFileCachePrivate *priv = GET_PRIVATE (file_cache);
- g_return_if_fail(!champlain_tile_cache_get_persistent(tile_cache));
+ g_return_if_fail (!champlain_tile_cache_get_persistent (tile_cache));
finalize_sql (file_cache);
- delete_temp_cache(file_cache);
+ delete_temp_cache (file_cache);
- g_free(priv->real_cache_dir);
+ g_free (priv->real_cache_dir);
priv->real_cache_dir = NULL;
- init_cache(file_cache);
+ init_cache (file_cache);
}
static void
@@ -833,7 +833,7 @@ champlain_file_cache_purge (ChamplainFileCache *file_cache)
rc = sqlite3_prepare (priv->db, query, strlen (query), &stmt, NULL);
if (rc != SQLITE_OK)
{
- DEBUG ("Can't fetch tiles to delete: %s", sqlite3_errmsg(priv->db));
+ DEBUG ("Can't fetch tiles to delete: %s", sqlite3_errmsg (priv->db));
}
rc = sqlite3_step (stmt);
diff --git a/champlain/champlain-map-source-chain.c b/champlain/champlain-map-source-chain.c
index 25e381c..040e69a 100644
--- a/champlain/champlain-map-source-chain.c
+++ b/champlain/champlain-map-source-chain.c
@@ -49,7 +49,7 @@ champlain_map_source_chain_dispose (GObject *object)
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(object);
while (priv->stack_top)
- champlain_map_source_chain_pop_map_source(source_chain);
+ champlain_map_source_chain_pop_map_source (source_chain);
G_OBJECT_CLASS (champlain_map_source_chain_parent_class)->dispose (object);
}
@@ -105,7 +105,7 @@ get_id (ChamplainMapSource *map_source)
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
g_return_val_if_fail (priv->stack_top, NULL);
- return champlain_map_source_get_id(priv->stack_top);
+ return champlain_map_source_get_id (priv->stack_top);
}
static const gchar *
@@ -117,7 +117,7 @@ get_name (ChamplainMapSource *map_source)
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
g_return_val_if_fail (priv->stack_top, NULL);
- return champlain_map_source_get_name(priv->stack_top);
+ return champlain_map_source_get_name (priv->stack_top);
}
static const gchar *
@@ -129,7 +129,7 @@ get_license (ChamplainMapSource *map_source)
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
g_return_val_if_fail (priv->stack_top, NULL);
- return champlain_map_source_get_license(priv->stack_top);
+ return champlain_map_source_get_license (priv->stack_top);
}
static const gchar *
@@ -141,7 +141,7 @@ get_license_uri (ChamplainMapSource *map_source)
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
g_return_val_if_fail (priv->stack_top, NULL);
- return champlain_map_source_get_license_uri(priv->stack_top);
+ return champlain_map_source_get_license_uri (priv->stack_top);
}
static guint
@@ -153,7 +153,7 @@ get_min_zoom_level (ChamplainMapSource *map_source)
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
g_return_val_if_fail (priv->stack_top, 0);
- return champlain_map_source_get_min_zoom_level(priv->stack_top);
+ return champlain_map_source_get_min_zoom_level (priv->stack_top);
}
static guint
@@ -165,7 +165,7 @@ get_max_zoom_level (ChamplainMapSource *map_source)
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
g_return_val_if_fail (priv->stack_top, 0);
- return champlain_map_source_get_max_zoom_level(priv->stack_top);
+ return champlain_map_source_get_max_zoom_level (priv->stack_top);
}
static guint
@@ -177,7 +177,7 @@ get_tile_size (ChamplainMapSource *map_source)
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
g_return_val_if_fail (priv->stack_top, 0);
- return champlain_map_source_get_tile_size(priv->stack_top);
+ return champlain_map_source_get_tile_size (priv->stack_top);
}
static void fill_tile (ChamplainMapSource *map_source,
@@ -189,37 +189,37 @@ static void fill_tile (ChamplainMapSource *map_source,
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
g_return_if_fail (priv->stack_top);
- champlain_map_source_fill_tile(priv->stack_top, tile);
+ champlain_map_source_fill_tile (priv->stack_top, tile);
}
-static void assign_cache_of_next_source_sequence(ChamplainMapSource *start_map_source, ChamplainTileCache *tile_cache)
+static void assign_cache_of_next_source_sequence (ChamplainMapSource *start_map_source, ChamplainTileCache *tile_cache)
{
ChamplainMapSource *map_source = start_map_source;
ChamplainTileSource *tile_source;
do
{
- map_source = champlain_map_source_get_next_source(map_source);
+ map_source = champlain_map_source_get_next_source (map_source);
}
while (CHAMPLAIN_IS_TILE_CACHE(map_source));
tile_source = CHAMPLAIN_TILE_SOURCE(map_source);
while (tile_source)
{
- champlain_tile_source_set_cache(tile_source, tile_cache);
- map_source = champlain_map_source_get_next_source(map_source);
+ champlain_tile_source_set_cache (tile_source, tile_cache);
+ map_source = champlain_map_source_get_next_source (map_source);
tile_source = CHAMPLAIN_TILE_SOURCE(map_source);
}
}
static
-void reload_tiles_cb(ChamplainMapSource *map_source, ChamplainMapSourceChain *source_chain)
+void reload_tiles_cb (ChamplainMapSource *map_source, ChamplainMapSourceChain *source_chain)
{
/* propagate the signal from the chain that is inside champlain_map_source_chain */
g_signal_emit_by_name (source_chain, "reload-tiles", NULL);
}
-void champlain_map_source_chain_push(ChamplainMapSourceChain *source_chain, ChamplainMapSource *map_source)
+void champlain_map_source_chain_push (ChamplainMapSourceChain *source_chain, ChamplainMapSource *map_source)
{
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
gboolean is_cache = FALSE;
@@ -229,12 +229,12 @@ void champlain_map_source_chain_push(ChamplainMapSourceChain *source_chain, Cham
else
g_return_if_fail (CHAMPLAIN_IS_TILE_SOURCE(map_source));
- g_object_ref_sink(map_source);
+ g_object_ref_sink (map_source);
if (!priv->stack_top)
{
/* tile source has to be last */
- g_return_if_fail(!is_cache);
+ g_return_if_fail (!is_cache);
priv->stack_top = map_source;
}
else
@@ -242,13 +242,13 @@ void champlain_map_source_chain_push(ChamplainMapSourceChain *source_chain, Cham
if (g_signal_handler_is_connected (priv->stack_top, priv->sig_handler_id))
g_signal_handler_disconnect (priv->stack_top, priv->sig_handler_id);
- champlain_map_source_set_next_source(map_source, priv->stack_top);
+ champlain_map_source_set_next_source (map_source, priv->stack_top);
priv->stack_top = map_source;
if (is_cache)
{
ChamplainTileCache *tile_cache = CHAMPLAIN_TILE_CACHE(map_source);
- assign_cache_of_next_source_sequence(priv->stack_top, tile_cache);
+ assign_cache_of_next_source_sequence (priv->stack_top, tile_cache);
}
}
@@ -256,33 +256,33 @@ void champlain_map_source_chain_push(ChamplainMapSourceChain *source_chain, Cham
G_CALLBACK (reload_tiles_cb), source_chain);
}
-void champlain_map_source_chain_pop_map_source(ChamplainMapSourceChain *source_chain)
+void champlain_map_source_chain_pop_map_source (ChamplainMapSourceChain *source_chain)
{
ChamplainMapSourceChainPrivate *priv = GET_PRIVATE(source_chain);
ChamplainMapSource *old_stack_top = priv->stack_top;
- g_return_if_fail(priv->stack_top);
+ g_return_if_fail (priv->stack_top);
if (g_signal_handler_is_connected (priv->stack_top, priv->sig_handler_id))
g_signal_handler_disconnect (priv->stack_top, priv->sig_handler_id);
if (CHAMPLAIN_IS_TILE_CACHE(priv->stack_top))
{
- ChamplainMapSource *map_source = champlain_map_source_get_next_source(priv->stack_top);
+ ChamplainMapSource *map_source = champlain_map_source_get_next_source (priv->stack_top);
ChamplainTileCache *tile_cache = NULL;
if (CHAMPLAIN_IS_TILE_CACHE(map_source))
tile_cache = CHAMPLAIN_TILE_CACHE(map_source);
- assign_cache_of_next_source_sequence(priv->stack_top, tile_cache);
+ assign_cache_of_next_source_sequence (priv->stack_top, tile_cache);
}
- priv->stack_top = champlain_map_source_get_next_source(priv->stack_top);
+ priv->stack_top = champlain_map_source_get_next_source (priv->stack_top);
if (priv->stack_top)
{
priv->sig_handler_id = g_signal_connect (priv->stack_top, "reload-tiles",
G_CALLBACK (reload_tiles_cb), source_chain);
}
- g_object_unref(old_stack_top);
+ g_object_unref (old_stack_top);
}
diff --git a/champlain/champlain-map-source-chain.h b/champlain/champlain-map-source-chain.h
index f6d3379..92d22c7 100644
--- a/champlain/champlain-map-source-chain.h
+++ b/champlain/champlain-map-source-chain.h
@@ -53,8 +53,8 @@ GType champlain_map_source_chain_get_type (void);
ChamplainMapSourceChain* champlain_map_source_chain_new (void);
-void champlain_map_source_chain_push(ChamplainMapSourceChain *source_chain, ChamplainMapSource *map_source);
-void champlain_map_source_chain_pop_map_source(ChamplainMapSourceChain *source_chain);
+void champlain_map_source_chain_push (ChamplainMapSourceChain *source_chain, ChamplainMapSource *map_source);
+void champlain_map_source_chain_pop_map_source (ChamplainMapSourceChain *source_chain);
G_END_DECLS
diff --git a/champlain/champlain-map-source-factory.c b/champlain/champlain-map-source-factory.c
index 4c84555..eaeb393 100644
--- a/champlain/champlain-map-source-factory.c
+++ b/champlain/champlain-map-source-factory.c
@@ -91,7 +91,7 @@ champlain_map_source_factory_get_property (GObject *object,
//ChamplainMapSourceFactory *map_source_factory = CHAMPLAIN_MAP_SOURCE_FACTORY(object);
//ChamplainMapSourceFactoryPrivate *priv = map_source_factory->priv;
- switch(prop_id)
+ switch (prop_id)
{
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -107,7 +107,7 @@ champlain_map_source_factory_set_property (GObject *object,
//ChamplainMapSourceFactory *map_source_factory = CHAMPLAIN_MAP_SOURCE_FACTORY(object);
//ChamplainMapSourceFactoryPrivate *priv = map_source_factory->priv;
- switch(prop_id)
+ switch (prop_id)
{
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -383,15 +383,15 @@ ChamplainMapSource * champlain_map_source_factory_create_cached_source (Champlai
tile_source = champlain_map_source_factory_create (factory, id);
- tile_size = champlain_map_source_get_tile_size(tile_source);
+ tile_size = champlain_map_source_get_tile_size (tile_source);
error_source = CHAMPLAIN_MAP_SOURCE(champlain_error_tile_source_new_full (tile_size));
file_cache = CHAMPLAIN_MAP_SOURCE(champlain_file_cache_new ());
source_chain = champlain_map_source_chain_new ();
- champlain_map_source_chain_push(source_chain, error_source);
- champlain_map_source_chain_push(source_chain, tile_source);
- champlain_map_source_chain_push(source_chain, file_cache);
+ champlain_map_source_chain_push (source_chain, error_source);
+ champlain_map_source_chain_push (source_chain, tile_source);
+ champlain_map_source_chain_push (source_chain, file_cache);
return CHAMPLAIN_MAP_SOURCE(source_chain);
}
diff --git a/champlain/champlain-map-source.c b/champlain/champlain-map-source.c
index 42e5689..04c9989 100644
--- a/champlain/champlain-map-source.c
+++ b/champlain/champlain-map-source.c
@@ -48,7 +48,7 @@ struct _ChamplainMapSourcePrivate
gulong sig_handler_id;
};
-static void reload_tiles_cb(ChamplainMapSource *orig, ChamplainMapSource *self);
+static void reload_tiles_cb (ChamplainMapSource *orig, ChamplainMapSource *self);
static void
champlain_map_source_get_property (GObject *object,
@@ -58,7 +58,7 @@ champlain_map_source_get_property (GObject *object,
{
ChamplainMapSourcePrivate *priv = GET_PRIVATE(object);
- switch(prop_id)
+ switch (prop_id)
{
case PROP_NEXT_SOURCE:
g_value_set_object (value, priv->next_source);
@@ -76,7 +76,7 @@ champlain_map_source_set_property (GObject *object,
{
ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE(object);
- switch(prop_id)
+ switch (prop_id)
{
case PROP_NEXT_SOURCE:
champlain_map_source_set_next_source (map_source,
@@ -180,7 +180,7 @@ champlain_map_source_get_next_source (ChamplainMapSource *map_source)
}
static
-void reload_tiles_cb(ChamplainMapSource *orig, ChamplainMapSource *self)
+void reload_tiles_cb (ChamplainMapSource *orig, ChamplainMapSource *self)
{
/* propagate the signal up the chain */
g_signal_emit_by_name (self, "reload-tiles", NULL);
@@ -199,14 +199,14 @@ champlain_map_source_set_next_source (ChamplainMapSource *map_source,
if (g_signal_handler_is_connected (priv->next_source, priv->sig_handler_id))
g_signal_handler_disconnect (priv->next_source, priv->sig_handler_id);
- g_object_unref(priv->next_source);
+ g_object_unref (priv->next_source);
}
if (next_source)
{
g_return_if_fail (CHAMPLAIN_IS_MAP_SOURCE (next_source));
- g_object_ref_sink(next_source);
+ g_object_ref_sink (next_source);
priv->sig_handler_id = g_signal_connect (next_source, "reload-tiles",
G_CALLBACK (reload_tiles_cb), map_source);
@@ -281,7 +281,7 @@ champlain_map_source_get_x (ChamplainMapSource *map_source,
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (map_source), 0);
// FIXME: support other projections
- return ((longitude + 180.0) / 360.0 * pow(2.0, zoom_level)) * champlain_map_source_get_tile_size (map_source);
+ return ((longitude + 180.0) / 360.0 * pow (2.0, zoom_level)) * champlain_map_source_get_tile_size (map_source);
}
guint
diff --git a/champlain/champlain-memphis-tile-source.c b/champlain/champlain-memphis-tile-source.c
index 84496d2..b83fcb6 100644
--- a/champlain/champlain-memphis-tile-source.c
+++ b/champlain/champlain-memphis-tile-source.c
@@ -108,7 +108,7 @@ static void memphis_worker_thread (gpointer data, gpointer user_data);
static void map_data_changed_cb (ChamplainMapDataSource *map_data_source,
GParamSpec *gobject,
ChamplainMemphisTileSource *tile_source);
-void argb_to_rgba(guchar *data, guint size);
+void argb_to_rgba (guchar *data, guint size);
static void
champlain_memphis_tile_source_get_property (GObject *object,
@@ -190,7 +190,7 @@ champlain_memphis_tile_source_constructed (GObject *object)
ChamplainMapSource *map_source = CHAMPLAIN_MAP_SOURCE(object);
ChamplainMemphisTileSourcePrivate *priv = GET_PRIVATE(object);
- memphis_renderer_set_resolution (priv->renderer, champlain_map_source_get_tile_size(map_source));
+ memphis_renderer_set_resolution (priv->renderer, champlain_map_source_get_tile_size (map_source));
G_OBJECT_CLASS (champlain_memphis_tile_source_parent_class)->constructed (object);
}
@@ -326,7 +326,7 @@ map_data_changed_cb (ChamplainMapDataSource *map_data_source,
Transform ARGB (Cairo) to RGBA (GdkPixbuf). RGBA is actualy reversed in
memory, so the transformation is ARGB -> ABGR (i.e. swapping B and R)
*/
-void argb_to_rgba(guchar *data, guint size)
+void argb_to_rgba (guchar *data, guint size)
{
guint32 *ptr;
guint32 *endptr = (guint32 *)data + size / 4;
@@ -342,7 +342,7 @@ tile_loaded_cb (gpointer data)
ChamplainTile *tile = tdata->tile;
cairo_surface_t *cst = tdata->cst;
ChamplainTileSource *tile_source = CHAMPLAIN_TILE_SOURCE(map_source);
- ChamplainTileCache *tile_cache = champlain_tile_source_get_cache(tile_source);
+ ChamplainTileCache *tile_cache = champlain_tile_source_get_cache (tile_source);
cairo_t *cr_clutter;
ClutterActor *actor;
guint size;
@@ -372,26 +372,26 @@ tile_loaded_cb (gpointer data)
/* modify directly the buffer of cairo surface - we don't use it any more
and we close the surface anyway */
- argb_to_rgba(cairo_image_surface_get_data(cst),
- cairo_image_surface_get_stride(cst) * cairo_image_surface_get_height(cst));
-
- pixbuf = gdk_pixbuf_new_from_data(cairo_image_surface_get_data(cst),
- GDK_COLORSPACE_RGB,
- TRUE,
- 8,
- size,
- size,
- cairo_image_surface_get_stride(cst),
- NULL,
- NULL);
-
- if (gdk_pixbuf_save_to_buffer(pixbuf, &buffer, &buffer_size, "png", &error, NULL))
+ argb_to_rgba (cairo_image_surface_get_data (cst),
+ cairo_image_surface_get_stride (cst) * cairo_image_surface_get_height (cst));
+
+ pixbuf = gdk_pixbuf_new_from_data (cairo_image_surface_get_data (cst),
+ GDK_COLORSPACE_RGB,
+ TRUE,
+ 8,
+ size,
+ size,
+ cairo_image_surface_get_stride (cst),
+ NULL,
+ NULL);
+
+ if (gdk_pixbuf_save_to_buffer (pixbuf, &buffer, &buffer_size, "png", &error, NULL))
{
- champlain_tile_cache_store_tile(tile_cache, tile, buffer, buffer_size);
+ champlain_tile_cache_store_tile (tile_cache, tile, buffer, buffer_size);
}
- g_free(buffer);
- g_object_unref(pixbuf);
+ g_free (buffer);
+ g_object_unref (pixbuf);
}
cairo_surface_destroy (cst);
@@ -457,10 +457,10 @@ fill_tile (ChamplainMapSource *map_source, ChamplainTile *tile)
if (priv->no_map_data)
{
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
if (CHAMPLAIN_IS_MAP_SOURCE(next_source))
- champlain_map_source_fill_tile(next_source, tile);
+ champlain_map_source_fill_tile (next_source, tile);
}
else
{
@@ -478,8 +478,8 @@ fill_tile (ChamplainMapSource *map_source, ChamplainTile *tile)
{
g_error ("Thread pool error: %s", error->message);
g_error_free (error);
- g_object_unref(map_source);
- g_object_unref(tile);
+ g_object_unref (map_source);
+ g_object_unref (tile);
}
}
}
@@ -490,9 +490,9 @@ reload_tiles (ChamplainMemphisTileSource *tile_source)
g_return_if_fail (CHAMPLAIN_IS_MEMPHIS_TILE_SOURCE (tile_source));
ChamplainTileSource *tile_src = CHAMPLAIN_TILE_SOURCE(tile_source);
- ChamplainTileCache *tile_cache = champlain_tile_source_get_cache(tile_src);
+ ChamplainTileCache *tile_cache = champlain_tile_source_get_cache (tile_src);
- if (tile_cache && !champlain_tile_cache_get_persistent(tile_cache))
+ if (tile_cache && !champlain_tile_cache_get_persistent (tile_cache))
{
DEBUG ("Clean temporary cache");
@@ -562,7 +562,7 @@ champlain_memphis_tile_source_set_map_data_source (
if (priv->map_data_source)
g_object_unref (priv->map_data_source);
- priv->map_data_source = g_object_ref_sink(map_data_source);
+ priv->map_data_source = g_object_ref_sink (map_data_source);
g_signal_connect (priv->map_data_source, "notify::state",
G_CALLBACK (map_data_changed_cb), tile_source);
diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
index f26a854..8ed45e1 100644
--- a/champlain/champlain-network-tile-source.c
+++ b/champlain/champlain-network-tile-source.c
@@ -92,7 +92,7 @@ champlain_network_tile_source_get_property (GObject *object,
{
ChamplainNetworkTileSourcePrivate *priv = GET_PRIVATE(object);
- switch(prop_id)
+ switch (prop_id)
{
case PROP_URI_FORMAT:
g_value_set_string (value, priv->uri_format);
@@ -116,16 +116,16 @@ champlain_network_tile_source_set_property (GObject *object,
{
ChamplainNetworkTileSource *tile_source = CHAMPLAIN_NETWORK_TILE_SOURCE(object);
- switch(prop_id)
+ switch (prop_id)
{
case PROP_URI_FORMAT:
- champlain_network_tile_source_set_uri_format(tile_source, g_value_get_string (value));
+ champlain_network_tile_source_set_uri_format (tile_source, g_value_get_string (value));
break;
case PROP_OFFLINE:
- champlain_network_tile_source_set_offline(tile_source, g_value_get_boolean (value));
+ champlain_network_tile_source_set_offline (tile_source, g_value_get_boolean (value));
break;
case PROP_PROXY_URI:
- champlain_network_tile_source_set_proxy_uri(tile_source, g_value_get_string (value));
+ champlain_network_tile_source_set_proxy_uri (tile_source, g_value_get_string (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
@@ -376,15 +376,15 @@ tile_loaded_cb (SoupSession *session,
TileLoadedCallbackData *callback_data = (TileLoadedCallbackData *)user_data;
ChamplainMapSource *map_source = callback_data->map_source;
ChamplainTileSource *tile_source = CHAMPLAIN_TILE_SOURCE(map_source);
- ChamplainTileCache *tile_cache = champlain_tile_source_get_cache(tile_source);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainTileCache *tile_cache = champlain_tile_source_get_cache (tile_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
ChamplainTile *tile = callback_data->tile;
GdkPixbufLoader* loader;
GError *error = NULL;
ClutterActor *actor;
const gchar *etag;
- g_free(user_data);
+ g_free (user_data);
DEBUG ("Got reply %d", msg->status_code);
@@ -402,7 +402,7 @@ tile_loaded_cb (SoupSession *session,
if (msg->status_code == SOUP_STATUS_NOT_MODIFIED)
{
if (tile_cache)
- champlain_tile_cache_refresh_tile_time(tile_cache, tile);
+ champlain_tile_cache_refresh_tile_time (tile_cache, tile);
goto finish;
}
@@ -417,7 +417,7 @@ tile_loaded_cb (SoupSession *session,
}
/* Load the data from the http response */
- loader = gdk_pixbuf_loader_new();
+ loader = gdk_pixbuf_loader_new ();
if (!gdk_pixbuf_loader_write (loader,
(const guchar *) msg->response_body->data,
msg->response_body->length,
@@ -484,7 +484,7 @@ load_next_cleanup:
load_next:
if (next_source)
{
- champlain_map_source_fill_tile(next_source, tile);
+ champlain_map_source_fill_tile (next_source, tile);
}
g_object_unref (tile);
g_object_unref (map_source);
@@ -546,7 +546,7 @@ fill_tile (ChamplainMapSource *map_source,
g_free (date);
}
- callback_data = g_new(TileLoadedCallbackData, 1);
+ callback_data = g_new (TileLoadedCallbackData, 1);
callback_data->tile = tile;
callback_data->map_source = map_source;
@@ -562,9 +562,9 @@ fill_tile (ChamplainMapSource *map_source,
}
else
{
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
if (CHAMPLAIN_IS_MAP_SOURCE(next_source))
- champlain_map_source_fill_tile(next_source, tile);
+ champlain_map_source_fill_tile (next_source, tile);
}
}
diff --git a/champlain/champlain-tile-cache.c b/champlain/champlain-tile-cache.c
index 5d5e43b..c7c8354 100644
--- a/champlain/champlain-tile-cache.c
+++ b/champlain/champlain-tile-cache.c
@@ -193,11 +193,11 @@ get_id (ChamplainMapSource *map_source)
{
g_return_val_if_fail (CHAMPLAIN_IS_TILE_CACHE (map_source), NULL);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (next_source), NULL);
- return champlain_map_source_get_id(next_source);
+ return champlain_map_source_get_id (next_source);
}
static const gchar *
@@ -205,11 +205,11 @@ get_name (ChamplainMapSource *map_source)
{
g_return_val_if_fail (CHAMPLAIN_IS_TILE_CACHE (map_source), NULL);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (next_source), NULL);
- return champlain_map_source_get_name(next_source);
+ return champlain_map_source_get_name (next_source);
}
static const gchar *
@@ -217,11 +217,11 @@ get_license (ChamplainMapSource *map_source)
{
g_return_val_if_fail (CHAMPLAIN_IS_TILE_CACHE (map_source), NULL);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (next_source), NULL);
- return champlain_map_source_get_license(next_source);
+ return champlain_map_source_get_license (next_source);
}
static const gchar *
@@ -229,11 +229,11 @@ get_license_uri (ChamplainMapSource *map_source)
{
g_return_val_if_fail (CHAMPLAIN_IS_TILE_CACHE (map_source), NULL);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (next_source), NULL);
- return champlain_map_source_get_license_uri(next_source);
+ return champlain_map_source_get_license_uri (next_source);
}
static guint
@@ -241,11 +241,11 @@ get_min_zoom_level (ChamplainMapSource *map_source)
{
g_return_val_if_fail (CHAMPLAIN_IS_TILE_CACHE (map_source), 0);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (next_source), 0);
- return champlain_map_source_get_min_zoom_level(next_source);
+ return champlain_map_source_get_min_zoom_level (next_source);
}
static guint
@@ -253,11 +253,11 @@ get_max_zoom_level (ChamplainMapSource *map_source)
{
g_return_val_if_fail (CHAMPLAIN_IS_TILE_CACHE (map_source), 0);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (next_source), 0);
- return champlain_map_source_get_max_zoom_level(next_source);
+ return champlain_map_source_get_max_zoom_level (next_source);
}
static guint
@@ -265,9 +265,9 @@ get_tile_size (ChamplainMapSource *map_source)
{
g_return_val_if_fail (CHAMPLAIN_IS_TILE_CACHE (map_source), 0);
- ChamplainMapSource *next_source = champlain_map_source_get_next_source(map_source);
+ ChamplainMapSource *next_source = champlain_map_source_get_next_source (map_source);
g_return_val_if_fail (CHAMPLAIN_IS_MAP_SOURCE (next_source), 0);
- return champlain_map_source_get_tile_size(next_source);
+ return champlain_map_source_get_tile_size (next_source);
}
diff --git a/champlain/champlain-tile-source.c b/champlain/champlain-tile-source.c
index 7a04dce..efb1b6d 100644
--- a/champlain/champlain-tile-source.c
+++ b/champlain/champlain-tile-source.c
@@ -69,7 +69,7 @@ champlain_tile_source_get_property (GObject *object,
{
ChamplainTileSourcePrivate *priv = GET_PRIVATE(object);
- switch(prop_id)
+ switch (prop_id)
{
case PROP_ID:
g_value_set_string (value, priv->id);
@@ -111,7 +111,7 @@ champlain_tile_source_set_property (GObject *object,
{
ChamplainTileSource *tile_source = CHAMPLAIN_TILE_SOURCE(object);
- switch(prop_id)
+ switch (prop_id)
{
case PROP_ID:
champlain_tile_source_set_id (tile_source,
@@ -337,13 +337,13 @@ champlain_tile_source_set_cache (ChamplainTileSource *tile_source,
ChamplainTileSourcePrivate *priv = GET_PRIVATE(tile_source);
if (priv->cache != NULL)
- g_object_unref(priv->cache);
+ g_object_unref (priv->cache);
if (cache)
{
g_return_if_fail (CHAMPLAIN_IS_TILE_CACHE (cache));
- g_object_ref_sink(cache);
+ g_object_ref_sink (cache);
}
priv->cache = cache;
diff --git a/demos/local-rendering.c b/demos/local-rendering.c
index dfeeb52..c1ddaa1 100644
--- a/demos/local-rendering.c
+++ b/demos/local-rendering.c
@@ -81,12 +81,12 @@ data_source_state_changed (ChamplainView *view,
if (state == CHAMPLAIN_STATE_LOADING)
{
gtk_image_set_from_stock (image, GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON);
- g_print("NET DATA SOURCE STATE: loading\n");
+ g_print ("NET DATA SOURCE STATE: loading\n");
}
else
{
gtk_image_clear (image);
- g_print("NET DATA SOURCE STATE: done\n");
+ g_print ("NET DATA SOURCE STATE: done\n");
}
}
@@ -461,15 +461,15 @@ map_source_changed (GtkWidget *widget, ChamplainView *view)
source_chain = champlain_map_source_chain_new ();
- tile_size = champlain_map_source_get_tile_size(tile_source);
+ tile_size = champlain_map_source_get_tile_size (tile_source);
src = CHAMPLAIN_MAP_SOURCE(champlain_error_tile_source_new_full (tile_size));
- champlain_map_source_chain_push(source_chain, src);
- champlain_map_source_chain_push(source_chain, tile_source);
+ champlain_map_source_chain_push (source_chain, src);
+ champlain_map_source_chain_push (source_chain, tile_source);
src = CHAMPLAIN_MAP_SOURCE(champlain_file_cache_new_full (100000000, NULL, FALSE));
- champlain_map_source_chain_push(source_chain, src);
+ champlain_map_source_chain_push (source_chain, src);
g_object_set (G_OBJECT (view), "map-source", source_chain, NULL);
if (strncmp (id, "memphis", 7) == 0)
@@ -524,7 +524,7 @@ static void
zoom_changed (GtkSpinButton *spinbutton,
ChamplainView *view)
{
- gint zoom = gtk_spin_button_get_value_as_int(spinbutton);
+ gint zoom = gtk_spin_button_get_value_as_int (spinbutton);
g_object_set (G_OBJECT(view), "zoom-level", zoom, NULL);
}
@@ -535,21 +535,21 @@ map_zoom_changed (ChamplainView *view,
{
gint zoom;
g_object_get (G_OBJECT(view), "zoom-level", &zoom, NULL);
- gtk_spin_button_set_value(spinbutton, zoom);
+ gtk_spin_button_set_value (spinbutton, zoom);
}
static void
zoom_in (GtkWidget *widget,
ChamplainView *view)
{
- champlain_view_zoom_in(view);
+ champlain_view_zoom_in (view);
}
static void
zoom_out (GtkWidget *widget,
ChamplainView *view)
{
- champlain_view_zoom_out(view);
+ champlain_view_zoom_out (view);
}
static void
@@ -730,7 +730,7 @@ main (int argc,
g_signal_connect (button, "clicked", G_CALLBACK (zoom_out), view);
gtk_container_add (GTK_CONTAINER (bbox), button);
- button = gtk_spin_button_new_with_range(0, 20, 1);
+ button = gtk_spin_button_new_with_range (0, 20, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (button),
champlain_view_get_zoom_level (view));
g_signal_connect (button, "changed", G_CALLBACK (zoom_changed), view);
@@ -819,8 +819,8 @@ main (int argc,
gtk_tree_view_append_column (GTK_TREE_VIEW (tree_view), column);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tree_view), FALSE);
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
- g_signal_connect(tree_view, "row-activated", G_CALLBACK(list_item_selected_cb), view);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(tree_view));
+ g_signal_connect (tree_view, "row-activated", G_CALLBACK(list_item_selected_cb), view);
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]