copyediting: more whitespace reformatting

diff --git a/gtk/notify.c b/gtk/notify.c
index 77d71bed0f9cf49c7c4c372eecdd068bf94f9366..92610c3d7e932b74beb675b6c5f5415e93ce3729 100644 (file)
--- a/gtk/notify.c
+++ b/gtk/notify.c
@@ -30,18 +30,21 @@ static gboolean server_supports_actions = FALSE;
 
 typedef struct _TrNotification
 {
-    guint    id;
-    TrCore * core;
-    int      torrent_id;
-} TrNotification;
+  guint    id;
+  TrCore * core;
+  int      torrent_id;
+}
+TrNotification;
 
 static void
 tr_notification_free (gpointer data)
 {
-    TrNotification * n = data;
-    if (n->core)
-        g_object_unref (G_OBJECT (n->core));
-    g_free (n);
+  TrNotification * n = data;
+
+  if (n->core)
+    g_object_unref (G_OBJECT (n->core));
+
+  g_free (n);
 }
 
 static void
@@ -49,29 +52,30 @@ get_capabilities_callback (GObject      * source,
                            GAsyncResult * res,
                            gpointer       user_data UNUSED)
 {
-    GVariant  *result;
-    char     **caps;
-    int        i;
+  int i;
+  char ** caps;
+  GVariant * result;
 
-    result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, NULL);
-    if (!result || !g_variant_is_of_type (result, G_VARIANT_TYPE (" (as)")))
+  result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, NULL);
+  if (!result || !g_variant_is_of_type (result, G_VARIANT_TYPE ("(as)")))
     {
-        if (result)
-            g_variant_unref (result);
-        return;
+      if (result)
+        g_variant_unref (result);
+      return;
     }
 
-    g_variant_get (result, " (^a&s)", &caps);
-    for (i = 0; caps[i]; i++)
+  g_variant_get (result, "(^a&s)", &caps);
+  for (i=0; caps[i]; i++)
     {
-        if (strcmp (caps[i], "actions") == 0)
+      if (strcmp (caps[i], "actions") == 0)
         {
-            server_supports_actions = TRUE;
-            break;
+          server_supports_actions = TRUE;
+          break;
         }
     }
-    g_free (caps);
-    g_variant_unref (result);
+
+  g_free (caps);
+  g_variant_unref (result);
 }
 
 static void
@@ -81,44 +85,44 @@ g_signal_callback (GDBusProxy * proxy UNUSED,
                    GVariant   * params,
                    gpointer     user_data UNUSED)
 {
-    TrNotification * n;
-    guint id;
+  guint id;
+  TrNotification * n;
 
-    g_return_if_fail (g_variant_is_of_type (params, G_VARIANT_TYPE (" (u*)")));
+  g_return_if_fail (g_variant_is_of_type (params, G_VARIANT_TYPE ("(u*)")));
 
-    g_variant_get (params, " (u*)", &id, NULL);
-    n = g_hash_table_lookup (active_notifications,
-                             GINT_TO_POINTER ((int *) &id));
-    if (n == NULL)
-        return;
+  g_variant_get (params, "(u*)", &id, NULL);
+  n = g_hash_table_lookup (active_notifications,
+                           GINT_TO_POINTER ((int *) &id));
+  if (n == NULL)
+    return;
 
-    if (strcmp (signal_name, "NotificationClosed") == 0)
+  if (strcmp (signal_name, "NotificationClosed") == 0)
     {
-        g_hash_table_remove (active_notifications,
-                             GINT_TO_POINTER ((int *) &n->id));
+      g_hash_table_remove (active_notifications,
+                           GINT_TO_POINTER ((int *) &n->id));
     }
-    else if (strcmp (signal_name, "ActionInvoked") == 0 &&
-             g_variant_is_of_type (params, G_VARIANT_TYPE (" (us)")))
+  else if (strcmp (signal_name, "ActionInvoked") == 0 &&
+           g_variant_is_of_type (params, G_VARIANT_TYPE ("(us)")))
     {
-        char * action;
-        tr_torrent * tor;
+      char * action;
+      tr_torrent * tor;
 
-        tor = gtr_core_find_torrent (n->core, n->torrent_id);
-        if (tor == NULL)
-            return;
+      tor = gtr_core_find_torrent (n->core, n->torrent_id);
+      if (tor == NULL)
+        return;
 
-        g_variant_get (params, " (u&s)", NULL, &action);
-        if (strcmp (action, "folder") == 0)
+      g_variant_get (params, "(u&s)", NULL, &action);
+      if (strcmp (action, "folder") == 0)
         {
-            gtr_core_open_folder (n->core, n->torrent_id);
+          gtr_core_open_folder (n->core, n->torrent_id);
         }
-        else if (strcmp (action, "file") == 0)
+      else if (strcmp (action, "file") == 0)
         {
-            const tr_info * inf = tr_torrentInfo (tor);
-            const char * dir = tr_torrentGetDownloadDir (tor);
-            char * path = g_build_filename (dir, inf->files[0].name, NULL);
-            gtr_open_file (path);
-            g_free (path);
+          const tr_info * inf = tr_torrentInfo (tor);
+          const char * dir = tr_torrentGetDownloadDir (tor);
+          char * path = g_build_filename (dir, inf->files[0].name, NULL);
+          gtr_open_file (path);
+          g_free (path);
         }
     }
 }
@@ -128,34 +132,34 @@ dbus_proxy_ready_callback (GObject      * source UNUSED,
                            GAsyncResult * res,
                            gpointer       user_data UNUSED)
 {
-    proxy = g_dbus_proxy_new_for_bus_finish (res, NULL);
-    if (proxy == NULL)
+  proxy = g_dbus_proxy_new_for_bus_finish (res, NULL);
+  if (proxy == NULL)
     {
-        g_warning ("Failed to create proxy for %s", NOTIFICATIONS_DBUS_NAME);
-        return;
+      g_warning ("Failed to create proxy for %s", NOTIFICATIONS_DBUS_NAME);
+      return;
     }
 
-    g_signal_connect (proxy, "g-signal",
-                      G_CALLBACK (g_signal_callback), NULL);
-    g_dbus_proxy_call (proxy,
-                       "GetCapabilities",
-                       g_variant_new ("()"),
-                       G_DBUS_CALL_FLAGS_NONE, -1, NULL,
-                       get_capabilities_callback, NULL);
+  g_signal_connect (proxy, "g-signal",
+                    G_CALLBACK (g_signal_callback), NULL);
+  g_dbus_proxy_call (proxy,
+                     "GetCapabilities",
+                     g_variant_new ("()"),
+                     G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                     get_capabilities_callback, NULL);
 }
 
 void
 gtr_notify_init (void)
 {
-    active_notifications = g_hash_table_new_full (g_int_hash, g_int_equal,
-                                                  NULL, tr_notification_free);
-    g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-                              G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
-                              NULL,
-                              NOTIFICATIONS_DBUS_NAME,
-                              NOTIFICATIONS_DBUS_CORE_OBJECT,
-                              NOTIFICATIONS_DBUS_CORE_INTERFACE,
-                              NULL, dbus_proxy_ready_callback, NULL);
+  active_notifications = g_hash_table_new_full (g_int_hash, g_int_equal,
+                                                NULL, tr_notification_free);
+  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+                            G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+                            NULL,
+                            NOTIFICATIONS_DBUS_NAME,
+                            NOTIFICATIONS_DBUS_CORE_OBJECT,
+                            NOTIFICATIONS_DBUS_CORE_INTERFACE,
+                            NULL, dbus_proxy_ready_callback, NULL);
 }
 
 static void
@@ -163,92 +167,92 @@ notify_callback (GObject      * source,
                  GAsyncResult * res,
                  gpointer       user_data)
 {
-    TrNotification * n = user_data;
-    GVariant * result;
+  GVariant * result;
+  TrNotification * n = user_data;
 
-    result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, NULL);
-    if (!result || !g_variant_is_of_type (result, G_VARIANT_TYPE (" (u)")))
+  result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, NULL);
+  if (!result || !g_variant_is_of_type (result, G_VARIANT_TYPE ("(u)")))
     {
-        if (result)
-            g_variant_unref (result);
-        tr_notification_free (n);
-        return;
+      if (result)
+          g_variant_unref (result);
+      tr_notification_free (n);
+      return;
     }
 
-    g_variant_get (result, " (u)", &n->id);
-    g_hash_table_insert (active_notifications,
-                         GINT_TO_POINTER ((int *)&n->id), n);
+  g_variant_get (result, "(u)", &n->id);
+  g_hash_table_insert (active_notifications,
+                       GINT_TO_POINTER ((int *)&n->id), n);
 
-    g_variant_unref (result);
+  g_variant_unref (result);
 }
 
 void
 gtr_notify_torrent_completed (TrCore * core, int torrent_id)
 {
-    GVariantBuilder actions_builder;
-    TrNotification * n;
-    tr_torrent * tor;
-    const char * cmd = gtr_pref_string_get (PREF_KEY_TORRENT_COMPLETE_SOUND_COMMAND);
+  GVariantBuilder actions_builder;
+  TrNotification * n;
+  tr_torrent * tor;
+  const char * cmd = gtr_pref_string_get (PREF_KEY_TORRENT_COMPLETE_SOUND_COMMAND);
 
-    if (gtr_pref_flag_get (PREF_KEY_TORRENT_COMPLETE_SOUND_ENABLED))
-        g_spawn_command_line_async (cmd, NULL);
+  if (gtr_pref_flag_get (PREF_KEY_TORRENT_COMPLETE_SOUND_ENABLED))
+    g_spawn_command_line_async (cmd, NULL);
 
-    if (! gtr_pref_flag_get (PREF_KEY_TORRENT_COMPLETE_NOTIFICATION_ENABLED))
-        return;
+  if (!gtr_pref_flag_get (PREF_KEY_TORRENT_COMPLETE_NOTIFICATION_ENABLED))
+      return;
 
-    g_return_if_fail (G_IS_DBUS_PROXY (proxy));
+  g_return_if_fail (G_IS_DBUS_PROXY (proxy));
 
-    tor = gtr_core_find_torrent (core, torrent_id);
+  tor = gtr_core_find_torrent (core, torrent_id);
 
-    n = g_new0 (TrNotification, 1);
-    n->core = g_object_ref (G_OBJECT (core));
-    n->torrent_id = torrent_id;
+  n = g_new0 (TrNotification, 1);
+  n->core = g_object_ref (G_OBJECT (core));
+  n->torrent_id = torrent_id;
 
-    g_variant_builder_init (&actions_builder, G_VARIANT_TYPE ("as"));
+  g_variant_builder_init (&actions_builder, G_VARIANT_TYPE ("as"));
 
-    if (server_supports_actions)
+  if (server_supports_actions)
     {
-        const tr_info * inf = tr_torrentInfo (tor);
-        if (inf->fileCount == 1)
+      const tr_info * inf = tr_torrentInfo (tor);
+      if (inf->fileCount == 1)
         {
-            g_variant_builder_add (&actions_builder, "s", "file");
-            g_variant_builder_add (&actions_builder, "s", _("Open File"));
+          g_variant_builder_add (&actions_builder, "s", "file");
+          g_variant_builder_add (&actions_builder, "s", _("Open File"));
         }
-        else
+      else
         {
-            g_variant_builder_add (&actions_builder, "s", "folder");
-            g_variant_builder_add (&actions_builder, "s", _("Open Folder"));
+          g_variant_builder_add (&actions_builder, "s", "folder");
+          g_variant_builder_add (&actions_builder, "s", _("Open Folder"));
         }
     }
 
-    g_dbus_proxy_call (proxy,
-                       "Notify",
-                       g_variant_new ("(susssasa{sv}i)",
-                                      "Transmission", n->id, "transmission",
-                                      _("Torrent Complete"),
-                                      tr_torrentName (tor),
-                                      &actions_builder, NULL, -1),
-                       G_DBUS_CALL_FLAGS_NONE, -1, NULL,
-                       notify_callback, n);
+  g_dbus_proxy_call (proxy,
+                     "Notify",
+                     g_variant_new ("(susssasa{sv}i)",
+                                    "Transmission", n->id, "transmission",
+                                    _("Torrent Complete"),
+                                    tr_torrentName (tor),
+                                    &actions_builder, NULL, -1),
+                     G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                     notify_callback, n);
 }
 
 void
 gtr_notify_torrent_added (const char * name)
 {
-    TrNotification * n;
-
-    g_return_if_fail (G_IS_DBUS_PROXY (proxy));
-
-    if (!gtr_pref_flag_get (PREF_KEY_TORRENT_ADDED_NOTIFICATION_ENABLED))
-        return;
-
-    n = g_new0 (TrNotification, 1);
-    g_dbus_proxy_call (proxy,
-                       "Notify",
-                       g_variant_new ("(susssasa{sv}i)",
-                                      "Transmission", 0, "transmission",
-                                      _("Torrent Added"), name,
-                                      NULL, NULL, -1),
-                       G_DBUS_CALL_FLAGS_NONE, -1, NULL,
-                       notify_callback, n);
+  TrNotification * n;
+
+  g_return_if_fail (G_IS_DBUS_PROXY (proxy));
+
+  if (!gtr_pref_flag_get (PREF_KEY_TORRENT_ADDED_NOTIFICATION_ENABLED))
+    return;
+
+  n = g_new0 (TrNotification, 1);
+  g_dbus_proxy_call (proxy,
+                     "Notify",
+                     g_variant_new ("(susssasa{sv}i)",
+                                    "Transmission", 0, "transmission",
+                                    _("Torrent Added"), name,
+                                    NULL, NULL, -1),
+                     G_DBUS_CALL_FLAGS_NONE, -1, NULL,
+                     notify_callback, n);
 }