diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/file-share-properties.c | 4 | ||||
| -rw-r--r-- | src/http.c | 4 | ||||
| -rw-r--r-- | src/obexpush.c | 14 | ||||
| -rw-r--r-- | src/user_share-private.c | 12 | ||||
| -rw-r--r-- | src/user_share.c | 4 |
6 files changed, 21 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 91cd507..19cfbda 100644 --- a/configure.ac +++ b/configure.ac @@ -74,7 +74,7 @@ AC_SUBST(USER_SHARE_LIBS) PKG_CHECK_MODULES(USER_SHARE_CONFIG, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 gtk+-3.0 >= $GTK_REQUIRED_VERSION) AC_SUBST(USER_SHARE_CONFIG_CFLAGS) AC_SUBST(USER_SHARE_CONFIG_LIBS) - + AC_CHECK_LIB(socket, socket) have_socket=no @@ -92,7 +92,7 @@ fi AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal]) -dnl +dnl dnl Enable gsettigns schema macros dnl diff --git a/src/file-share-properties.c b/src/file-share-properties.c index 111a51b..a5759c6 100644 --- a/src/file-share-properties.c +++ b/src/file-share-properties.c @@ -85,7 +85,7 @@ flush_password (void) if (g_object_get_data (G_OBJECT( password_entry), "user_edited")) { password = gtk_entry_get_text (GTK_ENTRY (password_entry)); - if (password != NULL && password[0] != 0) + if (password != NULL && password[0] != 0) write_out_password (password); } } @@ -425,7 +425,7 @@ error_dialog (const char *title, (GTK_MESSAGE_DIALOG (error_dialog), "%s", reason); gtk_window_set_title (GTK_WINDOW (error_dialog), ""); /* as per HIG */ - gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5); + gtk_container_set_border_width (GTK_CONTAINER (error_dialog), 5); gtk_dialog_set_default_response (GTK_DIALOG (error_dialog), GTK_RESPONSE_OK); gtk_window_set_modal (GTK_WINDOW (error_dialog), TRUE); @@ -371,8 +371,8 @@ spawn_httpd (int port, pid_t *pid_out) got_pidfile = FALSE; error = NULL; for (i = 0; i < 5; i++) { - if (error != NULL) - g_error_free (error); + if (error != NULL) + g_error_free (error); error = NULL; if (g_file_get_contents (pid_filename, &pidfile, NULL, &error)) { got_pidfile = TRUE; diff --git a/src/obexpush.c b/src/obexpush.c index b2d6efe..73e4fd5 100644 --- a/src/obexpush.c +++ b/src/obexpush.c @@ -154,7 +154,7 @@ show_notification (const char *filename) g_strdup (file_uri), (GFreeFunc) g_free); g_free (file_uri); - + g_signal_connect (G_OBJECT (notification), "closed", G_CALLBACK (on_close_notification), notification); if (!notify_notification_show (notification, NULL)) { @@ -344,7 +344,7 @@ transfer_completed_cb (DBusGProxy *session, gpointer user_data) { GSettings *settings; - gboolean display_notify; + gboolean display_notify; const char *filename; filename = (const char *) g_object_get_data (G_OBJECT (session), "filename"); @@ -353,11 +353,11 @@ transfer_completed_cb (DBusGProxy *session, if (filename == NULL) return; - - settings = g_settings_new (GSETTINGS_SCHEMA); + + settings = g_settings_new (GSETTINGS_SCHEMA); display_notify = g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_OBEXPUSH_NOTIFY); g_object_unref (settings); - + if (display_notify) { show_notification (filename); } else { @@ -538,9 +538,9 @@ obexpush_init (void) G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT64, G_TYPE_INVALID); if (!notify_init("mate-user-share")) { - g_warning("Unable to initialize the notification system\n"); + g_warning("Unable to initialize the notification system\n"); } - + dbus_connection_set_exit_on_disconnect (dbus_g_connection_get_connection (connection), FALSE); return TRUE; diff --git a/src/user_share-private.c b/src/user_share-private.c index 5da48cf..f2739d8 100644 --- a/src/user_share-private.c +++ b/src/user_share-private.c @@ -43,10 +43,10 @@ static char *accept_file_strings[] = { const char * password_string_from_setting (PasswordSetting setting) { - + if (setting >= 0 && setting <= PASSWORD_ALWAYS) return password_setting_strings[setting]; - + /* Fallback on secure pref */ return password_setting_strings[PASSWORD_ALWAYS]; } @@ -65,7 +65,7 @@ password_setting_from_string (const char *str) return PASSWORD_ON_WRITE; } } - + /* Fallback on secure pref */ return PASSWORD_ALWAYS; } @@ -73,10 +73,10 @@ password_setting_from_string (const char *str) const char * accept_string_from_setting (AcceptSetting setting) { - + if (setting >= 0 && setting <= ACCEPT_ASK) return accept_file_strings[setting]; - + /* Fallback on secure pref */ return accept_file_strings[ACCEPT_BONDED]; } @@ -96,7 +96,7 @@ accept_setting_from_string (const char *str) return ACCEPT_ASK; } } - + /* Fallback on secure pref */ return ACCEPT_BONDED; } diff --git a/src/user_share.c b/src/user_share.c index ff56ca4..45033e4 100644 --- a/src/user_share.c +++ b/src/user_share.c @@ -91,7 +91,7 @@ obex_services_start (void) return; settings = g_settings_new(GSETTINGS_SCHEMA); - + if (g_settings_get_boolean (settings, FILE_SHARING_BLUETOOTH_OBEXPUSH_ENABLED) == TRUE) { obexpush_up (); } @@ -127,7 +127,7 @@ session_properties_changed_cb (GDBusProxy *session, else obex_services_shutdown (); - g_variant_unref (v); + g_variant_unref (v); } } |