projects
/
browser-switch
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4e09868
)
Eliminate trailing whitespace from lines
author
Steven Luo
<steven+maemo@steven676.net>
Thu, 26 Aug 2010 12:39:20 +0000
(
05:39
-0700)
committer
Steven Luo
<steven+maemo@steven676.net>
Thu, 26 Aug 2010 12:39:20 +0000
(
05:39
-0700)
config-ui/Makefile
patch
|
blob
|
history
config-ui/browser-switchboard-config.c
patch
|
blob
|
history
config-ui/browser-switchboard-cp.desktop
patch
|
blob
|
history
config-ui/save-config.c
patch
|
blob
|
history
configfile.c
patch
|
blob
|
history
dbus-server-bindings.c
patch
|
blob
|
history
launcher.c
patch
|
blob
|
history
main.c
patch
|
blob
|
history
diff --git
a/config-ui/Makefile
b/config-ui/Makefile
index
bb7ad98
..
6798080
100644
(file)
--- a/
config-ui/Makefile
+++ b/
config-ui/Makefile
@@
-58,7
+58,7
@@
$(HILDON_APP): $(happ_obj)
$(PLUGIN): $(plugin_obj)
$(CC) $(CFLAGS) $(CFLAGS_PLUGIN) -o $(PLUGIN) $(plugin_obj) \
$(LDFLAGS) $(LDFLAGS_PLUGIN)
$(PLUGIN): $(plugin_obj)
$(CC) $(CFLAGS) $(CFLAGS_PLUGIN) -o $(PLUGIN) $(plugin_obj) \
$(LDFLAGS) $(LDFLAGS_PLUGIN)
-
+
%.plugin.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_PLUGIN) $(CPPFLAGS) $(CPPFLAGS_PLUGIN) \
%.plugin.o: %.c
$(CC) $(CFLAGS) $(CFLAGS_PLUGIN) $(CPPFLAGS) $(CPPFLAGS_PLUGIN) \
diff --git
a/config-ui/browser-switchboard-config.c
b/config-ui/browser-switchboard-config.c
index
ec1e509
..
01d301f
100644
(file)
--- a/
config-ui/browser-switchboard-config.c
+++ b/
config-ui/browser-switchboard-config.c
@@
-1,5
+1,5
@@
/*
/*
- * browser-switchboard-config.c -- command-line configuration utility for
+ * browser-switchboard-config.c -- command-line configuration utility for
* Browser Switchboard
*
* Copyright (C) 2009-2010 Steven Luo
* Browser Switchboard
*
* Copyright (C) 2009-2010 Steven Luo
@@
-148,7
+148,7
@@
int main(int argc, char **argv) {
int opt, done = 0;
int set = 0;
char *selected_opt = NULL;
int opt, done = 0;
int set = 0;
char *selected_opt = NULL;
-
+
while (!done && (opt = getopt(argc, argv, "hsbcmo:")) != -1) {
switch (opt) {
case 'h':
while (!done && (opt = getopt(argc, argv, "hsbcmo:")) != -1) {
switch (opt) {
case 'h':
diff --git
a/config-ui/browser-switchboard-cp.desktop
b/config-ui/browser-switchboard-cp.desktop
index
518160c
..
c913b67
100644
(file)
--- a/
config-ui/browser-switchboard-cp.desktop
+++ b/
config-ui/browser-switchboard-cp.desktop
@@
-1,4
+1,4
@@
-[Desktop Entry]
+[Desktop Entry]
Encoding=UTF-8
Version=1.0
Name=Browser Switchboard
Encoding=UTF-8
Version=1.0
Name=Browser Switchboard
diff --git
a/config-ui/save-config.c
b/config-ui/save-config.c
index
4415b99
..
a80e089
100644
(file)
--- a/
config-ui/save-config.c
+++ b/
config-ui/save-config.c
@@
-38,7
+38,7
@@
static void swb_config_output_option(FILE *fp, unsigned int *oldcfg_seen,
struct swb_config *cfg, char *name) {
struct swb_config_option *opt;
ptrdiff_t i;
struct swb_config *cfg, char *name) {
struct swb_config_option *opt;
ptrdiff_t i;
-
+
for (opt = swb_config_options; opt->name; ++opt) {
if (strcmp(opt->name, name))
continue;
for (opt = swb_config_options; opt->name; ++opt) {
if (strcmp(opt->name, name))
continue;
diff --git
a/configfile.c
b/configfile.c
index
5ed02d6
..
0a522aa
100644
(file)
--- a/
configfile.c
+++ b/
configfile.c
@@
-169,7
+169,7
@@
int parse_config_file_line(FILE *fp, struct swb_config_line *line) {
/* calloc() zeroes the memory, so string is automatically
null terminated */
/* calloc() zeroes the memory, so string is automatically
null terminated */
- /* make key point to a null-terminated string holding the
+ /* make key point to a null-terminated string holding the
config key */
len = substrs[1].rm_eo - substrs[1].rm_so;
memmove(line->key, line->key+substrs[1].rm_so, len);
config key */
len = substrs[1].rm_eo - substrs[1].rm_so;
memmove(line->key, line->key+substrs[1].rm_so, len);
diff --git
a/dbus-server-bindings.c
b/dbus-server-bindings.c
index
dfdc980
..
748f557
100644
(file)
--- a/
dbus-server-bindings.c
+++ b/
dbus-server-bindings.c
@@
-160,7
+160,7
@@
void dbus_request_osso_browser_name(struct swb_context *ctx) {
log_msg("Couldn't acquire name com.nokia.osso_browser\n");
exit(1);
}
log_msg("Couldn't acquire name com.nokia.osso_browser\n");
exit(1);
}
- if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
log_msg("Couldn't acquire name com.nokia.osso_browser\n");
exit(1);
}
log_msg("Couldn't acquire name com.nokia.osso_browser\n");
exit(1);
}
@@
-177,7
+177,7
@@
void dbus_request_osso_browser_name(struct swb_context *ctx) {
log_msg("Couldn't acquire name com.nokia.osso_browser on system bus\n");
g_error_free(error);
}
log_msg("Couldn't acquire name com.nokia.osso_browser on system bus\n");
g_error_free(error);
}
- if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
log_msg("Couldn't acquire name com.nokia.osso_browser on system bus\n");
}
}
log_msg("Couldn't acquire name com.nokia.osso_browser on system bus\n");
}
}
diff --git
a/launcher.c
b/launcher.c
index
fe57eb9
..
2c4fbbe
100644
(file)
--- a/
launcher.c
+++ b/
launcher.c
@@
-517,7
+517,7
@@
void launch_microb(struct swb_context *ctx, char *uri) {
if (kill_browserd)
system("kill `pidof browserd`");
if (kill_browserd)
system("kill `pidof browserd`");
- if (!ctx || !ctx->continuous_mode)
+ if (!ctx || !ctx->continuous_mode)
exit(0);
dbus_request_osso_browser_name(ctx);
exit(0);
dbus_request_osso_browser_name(ctx);
@@
-590,7
+590,7
@@
static void launch_other_browser(struct swb_context *ctx, char *uri) {
/* Parent process or error in fork() */
if (urilen > 0)
free(quoted_uri);
/* Parent process or error in fork() */
if (urilen > 0)
free(quoted_uri);
- free(command);
+ free(command);
return;
}
/* Child process */
return;
}
/* Child process */
diff --git
a/main.c
b/main.c
index
99b2fad
..
af022c8
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-142,7
+142,7
@@
int main() {
error->message);
return 1;
}
error->message);
return 1;
}
- if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+ if (reqname_result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
log_msg("Another browser-switchboard already running\n");
return 1;
}
log_msg("Another browser-switchboard already running\n");
return 1;
}