diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-02-22 15:44:14 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-02-22 15:44:14 +0000 |
| commit | e0fc81b5d884ffb31144200ce823f4813ea0ebd8 (patch) | |
| tree | f8f926c5bf143caf47f19a2a6da33686afadb214 /examples | |
| parent | 7f787451c7b7762bf61197151404498f995d4e5f (diff) | |
Fix shadowing and unintentional globals in the examples
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/client/extended-client.c | 10 | ||||
| -rw-r--r-- | examples/client/inspect-cm.c | 2 | ||||
| -rw-r--r-- | examples/client/inspect-connection.c | 2 | ||||
| -rw-r--r-- | examples/client/list-connections.c | 2 | ||||
| -rw-r--r-- | examples/cm/echo/factory.c | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/examples/client/extended-client.c b/examples/client/extended-client.c index 2d398cbb2..a26e699c6 100644 --- a/examples/client/extended-client.c +++ b/examples/client/extended-client.c @@ -191,7 +191,7 @@ cm_requested_connection (TpConnectionManager *manager, static void connection_manager_got_info (TpConnectionManager *cm, guint source, - GMainLoop *mainloop) + gpointer unused) { g_message ("Emitted got-info (source=%d)", source); @@ -218,8 +218,8 @@ connection_manager_got_info (TpConnectionManager *cm, } } -gboolean -time_out (gpointer mainloop) +static gboolean +time_out (gpointer unused) { g_warning ("Timed out trying to get CM info"); g_main_loop_quit (mainloop); @@ -250,9 +250,9 @@ main (int argc, } g_signal_connect (cm, "got-info", - G_CALLBACK (connection_manager_got_info), mainloop); + G_CALLBACK (connection_manager_got_info), NULL); - timer = g_timeout_add (5000, time_out, mainloop); + timer = g_timeout_add (5000, time_out, NULL); g_main_loop_run (mainloop); diff --git a/examples/client/inspect-cm.c b/examples/client/inspect-cm.c index 8bfe91bf7..0e09f7fa8 100644 --- a/examples/client/inspect-cm.c +++ b/examples/client/inspect-cm.c @@ -40,7 +40,7 @@ connection_manager_got_info (TpConnectionManager *cm, g_main_loop_quit (mainloop); } -gboolean +static gboolean time_out (gpointer mainloop) { g_message ("Timed out"); diff --git a/examples/client/inspect-connection.c b/examples/client/inspect-connection.c index 54d51e3d7..5b961e2b8 100644 --- a/examples/client/inspect-connection.c +++ b/examples/client/inspect-connection.c @@ -17,7 +17,7 @@ #include <telepathy-glib/interfaces.h> #include <telepathy-glib/util.h> -void +static void got_channels (TpConnection *connection, const GPtrArray *channels, const GError *error, diff --git a/examples/client/list-connections.c b/examples/client/list-connections.c index 6becce53c..c655efbcb 100644 --- a/examples/client/list-connections.c +++ b/examples/client/list-connections.c @@ -18,7 +18,7 @@ typedef struct { int exit_code; } ExampleData; -void +static void got_connections (const gchar * const *bus_names, gsize n, const gchar * const *cms, diff --git a/examples/cm/echo/factory.c b/examples/cm/echo/factory.c index 8a7e10158..632207e6f 100644 --- a/examples/cm/echo/factory.c +++ b/examples/cm/echo/factory.c @@ -217,7 +217,7 @@ request (TpChannelFactoryIface *iface, const gchar *chan_type, TpHandleType handle_type, guint handle, - gpointer request, + gpointer request_id, TpChannelIface **ret, GError **error) { |