diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | uzbl.c | 16 |
2 files changed, 10 insertions, 10 deletions
@@ -19,7 +19,7 @@ Contributors: (mxf) - uzblcat Mark Nevill - misc patches Uli Schlachter (psychon) - basic mime_policy_cb & Makefile patch - (uranther) - zoom level + James S Wheaton (uranther) - zoom level, test framework (bobpaul) - session script patches Tom Adams (holizz) - few patches, cookies.py, gtkplug/socket & proof of concept uzbl_tabbed.py neutralinsomniac - load_progress = 0 fix @@ -31,7 +31,7 @@ Contributors: Aaron Griffin (phrakture) - Makefile patches to build on OSX Mason Larobina - os.environ.keys() & os.path.join fix in cookies.py, work on uzbl_tabbed.py (dequis) - Uzbl.run, birectional socket, javascript commands - Brendan Taylor (bct) - various bugfixes + Brendan Taylor (bct) - various bugfixes, making misc variables much better using expand(), refactoring some internal var stuff Chris van Dijk (quigybo) - work on uzbl_tabbed.py Moritz Lenz - small doc fix Sergey Shepelev (temoto) - doc patch @@ -67,13 +67,13 @@ GOptionEntry entries[] = "Uri to load at startup (equivalent to 'set uri = URI')", "URI" }, { "verbose", 'v', 0, G_OPTION_ARG_NONE, &uzbl.state.verbose, "Whether to print all messages or just errors.", NULL }, - { "name", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, + { "name", 'n', 0, G_OPTION_ARG_STRING, &uzbl.state.instance_name, "Name of the current instance (defaults to Xorg window id)", "NAME" }, - { "config", 'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file, + { "config", 'c', 0, G_OPTION_ARG_STRING, &uzbl.state.config_file, "Config file (this is pretty much equivalent to uzbl < FILE )", "FILE" }, - { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, + { "socket", 's', 0, G_OPTION_ARG_INT, &uzbl.state.socket_id, "Socket ID", "SOCKET" }, - { "geometry", 'g', 0, G_OPTION_ARG_STRING, &uzbl.gui.geometry, + { "geometry", 'g', 0, G_OPTION_ARG_STRING, &uzbl.gui.geometry, "Set window geometry (format: WIDTHxHEIGHT+-X+-Y)", "GEOMETRY" }, { "version", 'V', 0, G_OPTION_ARG_NONE, &uzbl.behave.print_version, "Print the version and exit", NULL }, @@ -635,7 +635,7 @@ cmd_set_geometry() { if(uzbl.state.verbose) printf("Error in geometry string: %s\n", uzbl.gui.geometry); } - /* update geometry var with the actual geometry + /* update geometry var with the actual geometry this is necessary as some WMs don't seem to honour the above setting and we don't want to end up with wrong geometry information @@ -1695,7 +1695,7 @@ set_var_value(gchar *name, gchar *val) { char *buf = NULL; if( (c = g_hash_table_lookup(uzbl.comm.proto_var, name)) ) { - if(!c->writeable) return TRUE; + if(!c->writeable) return FALSE; /* check for the variable type */ if (c->type == TYPE_STR) { @@ -2057,8 +2057,8 @@ key_press_cb (GtkWidget* window, GdkEventKey* event) return TRUE; } - if (uzbl.behave.insert_mode && - ( ((event->state & uzbl.behave.modmask) != uzbl.behave.modmask) || + if (uzbl.behave.insert_mode && + ( ((event->state & uzbl.behave.modmask) != uzbl.behave.modmask) || (!uzbl.behave.modmask) ) ) |