diff --git a/src/gjs.c b/src/gjs.c index 36dd45a7..7074f939 100644 --- a/src/gjs.c +++ b/src/gjs.c @@ -326,15 +326,11 @@ _js_object_call_as_function_cb (JSContextRef js_context, if (!n_arguments) { - gtk_widget_show (GTK_WIDGET (object)); } else if (n_arguments == 1) { JSObjectRef js_arg1 = JSValueToObject ( js_context, js_arguments[0], NULL); - GObject* arg1 = JSObjectGetPrivate (js_arg1); - if (arg1) - gtk_container_add (GTK_CONTAINER (object), GTK_WIDGET (arg1)); } return JSValueMakeUndefined (js_context); @@ -478,7 +474,7 @@ gjs_module_new (JSContextRef js_context, js_class_def.hasProperty = _js_module_has_property_cb; js_class_def.getProperty = _js_module_get_property_cb; JSClassRef js_class = JSClassCreate (&js_class_def); - JSObjectRef js_module = JSObjectMake (js_context, js_class, namespace); + JSObjectRef js_module = JSObjectMake (js_context, js_class, (gpointer)namespace); return js_module; } diff --git a/src/midori-addons.c b/src/midori-addons.c index b83f7c7c..a5a2985b 100644 --- a/src/midori-addons.c +++ b/src/midori-addons.c @@ -14,6 +14,7 @@ #include "midori-addons.h" #include "sokoke.h" +#include "gjs.h" #include #include #include diff --git a/src/midori-browser.c b/src/midori-browser.c index cd1a2227..3bf8d6d5 100644 --- a/src/midori-browser.c +++ b/src/midori-browser.c @@ -565,7 +565,7 @@ midori_browser_class_init (MidoriBrowserClass* class) "element-motion", G_TYPE_FROM_CLASS (class), (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), - G_STRUCT_OFFSET (MidoriBrowserClass, new_window), + G_STRUCT_OFFSET (MidoriBrowserClass, element_motion), 0, NULL, g_cclosure_marshal_VOID__STRING, diff --git a/src/midori-websettings.c b/src/midori-websettings.c index 4304bb89..20bbcc01 100644 --- a/src/midori-websettings.c +++ b/src/midori-websettings.c @@ -485,7 +485,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class) _("Where to open new pages"), MIDORI_TYPE_NEW_PAGE, MIDORI_NEW_PAGE_TAB, - flags)); + G_PARAM_READABLE)); g_object_class_install_property (gobject_class, PROP_MIDDLE_CLICK_OPENS_SELECTION, diff --git a/src/sokoke.c b/src/sokoke.c index 403dae6b..17bbc8cc 100644 --- a/src/sokoke.c +++ b/src/sokoke.c @@ -17,9 +17,6 @@ #include "main.h" #include -#ifdef HAVE_UNISTD_H - #include -#endif #include #include #include @@ -90,12 +87,6 @@ sokoke_entry_append_completion (GtkEntry* entry, const gchar* text) gtk_list_store_set (GTK_LIST_STORE (completion_store), &iter, 0, text, -1); } -#if SOKOKE_DEBUG > 1 - #define UNIMPLEMENTED g_print(" * Unimplemented: %s\n", G_STRFUNC); -#else - #define UNIMPLEMENTED ; -#endif - void sokoke_combo_box_add_strings(GtkComboBox* combobox , const gchar* labelFirst, ...) {