diff options
Diffstat (limited to 'src/window-commands.c')
| -rw-r--r-- | src/window-commands.c | 2298 |
1 files changed, 1116 insertions, 1182 deletions
diff --git a/src/window-commands.c b/src/window-commands.c index c899e4e83..c83fdd514 100644 --- a/src/window-commands.c +++ b/src/window-commands.c @@ -62,302 +62,284 @@ #define FAVICON_SIZE 16 void -window_cmd_file_print (GtkAction *action, - EphyWindow *window) +window_cmd_file_print (GtkAction *action, + EphyWindow *window) { - EphyEmbed *embed; - EphyWebView *view; + EphyEmbed *embed; + EphyWebView *view; - embed = ephy_embed_container_get_active_child - (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (EPHY_IS_EMBED (embed)); - view = ephy_embed_get_web_view (embed); + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (EPHY_IS_EMBED (embed)); + view = ephy_embed_get_web_view (embed); - ephy_web_view_print (view); + ephy_web_view_print (view); } void -window_cmd_undo_close_tab (GtkAction *action, - EphyWindow *window) +window_cmd_undo_close_tab (GtkAction *action, + EphyWindow *window) { - ephy_session_undo_close_tab (ephy_shell_get_session (ephy_shell_get_default ())); + ephy_session_undo_close_tab (ephy_shell_get_session (ephy_shell_get_default ())); } void -window_cmd_file_send_to (GtkAction *action, - EphyWindow *window) -{ - EphyEmbed *embed; - char *command, *subject, *body; - const char *location, *title; - GdkScreen *screen; - GError *error = NULL; - - embed = ephy_embed_container_get_active_child - (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); - - location = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); - title = ephy_embed_get_title (embed); - - subject = g_uri_escape_string (title, NULL, TRUE); - body = g_uri_escape_string (location, NULL, TRUE); - - command = g_strconcat ("mailto:", - "?Subject=", subject, - "&Body=", body, NULL); - - g_free (subject); - g_free (body); - - if (window) - { - screen = gtk_widget_get_screen (GTK_WIDGET (window)); - } - else - { - screen = gdk_screen_get_default (); - } - - if (!gtk_show_uri (screen, command, gtk_get_current_event_time(), &error)) - { - g_warning ("Unable to send link by email: %s\n", error->message); - g_error_free (error); - } - - g_free (command); +window_cmd_file_send_to (GtkAction *action, + EphyWindow *window) +{ + EphyEmbed *embed; + char *command, *subject, *body; + const char *location, *title; + GdkScreen *screen; + GError *error = NULL; + + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); + + location = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); + title = ephy_embed_get_title (embed); + + subject = g_uri_escape_string (title, NULL, TRUE); + body = g_uri_escape_string (location, NULL, TRUE); + + command = g_strconcat ("mailto:", + "?Subject=", subject, + "&Body=", body, NULL); + + g_free (subject); + g_free (body); + + if (window) { + screen = gtk_widget_get_screen (GTK_WIDGET (window)); + } else { + screen = gdk_screen_get_default (); + } + + if (!gtk_show_uri (screen, command, gtk_get_current_event_time (), &error)) { + g_warning ("Unable to send link by email: %s\n", error->message); + g_error_free (error); + } + + g_free (command); } static gboolean event_with_shift (void) { - GdkEvent *event; - GdkEventType type = 0; - guint state = 0; + GdkEvent *event; + GdkEventType type = 0; + guint state = 0; - event = gtk_get_current_event (); - if (event) - { - type = event->type; + event = gtk_get_current_event (); + if (event) { + type = event->type; - if (type == GDK_BUTTON_RELEASE) - { - state = event->button.state; - } - else if (type == GDK_KEY_PRESS || type == GDK_KEY_RELEASE) - { - state = event->key.state; - } + if (type == GDK_BUTTON_RELEASE) { + state = event->button.state; + } else if (type == GDK_KEY_PRESS || type == GDK_KEY_RELEASE) { + state = event->key.state; + } - gdk_event_free (event); - } + gdk_event_free (event); + } - return (state & GDK_SHIFT_MASK) != 0; + return (state & GDK_SHIFT_MASK) != 0; } void -window_cmd_go_location (GtkAction *action, - EphyWindow *window) +window_cmd_go_location (GtkAction *action, + EphyWindow *window) { - ephy_window_activate_location (window); + ephy_window_activate_location (window); } void -window_cmd_view_stop (GtkAction *action, - EphyWindow *window) +window_cmd_view_stop (GtkAction *action, + EphyWindow *window) { - EphyEmbed *embed; - - embed = ephy_embed_container_get_active_child - (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + EphyEmbed *embed; + + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - gtk_widget_grab_focus (GTK_WIDGET (embed)); + gtk_widget_grab_focus (GTK_WIDGET (embed)); - webkit_web_view_stop_loading (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)); + webkit_web_view_stop_loading (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)); } void -window_cmd_view_reload (GtkAction *action, - EphyWindow *window) +window_cmd_view_reload (GtkAction *action, + EphyWindow *window) { - EphyEmbed *embed; - WebKitWebView *view; + EphyEmbed *embed; + WebKitWebView *view; - embed = ephy_embed_container_get_active_child - (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - gtk_widget_grab_focus (GTK_WIDGET (embed)); + gtk_widget_grab_focus (GTK_WIDGET (embed)); - view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed); - if (event_with_shift ()) - webkit_web_view_reload_bypass_cache (view); - else - webkit_web_view_reload (view); + view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed); + if (event_with_shift ()) + webkit_web_view_reload_bypass_cache (view); + else + webkit_web_view_reload (view); } void -window_cmd_file_bookmark_page (GtkAction *action, - EphyWindow *window) +window_cmd_file_bookmark_page (GtkAction *action, + EphyWindow *window) { - EphyEmbed *embed; + EphyEmbed *embed; - embed = ephy_embed_container_get_active_child - (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - ephy_bookmarks_ui_add_bookmark (GTK_WINDOW (window), - ephy_web_view_get_address (ephy_embed_get_web_view (embed)), - ephy_embed_get_title (embed)); + ephy_bookmarks_ui_add_bookmark (GTK_WINDOW (window), + ephy_web_view_get_address (ephy_embed_get_web_view (embed)), + ephy_embed_get_title (embed)); } static void open_response_cb (GtkDialog *dialog, int response, EphyWindow *window) { - if (response == GTK_RESPONSE_ACCEPT) - { - char *uri, *converted; + if (response == GTK_RESPONSE_ACCEPT) { + char *uri, *converted; - uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - if (uri != NULL) - { - converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL); - - if (converted != NULL) - { - ephy_window_load_url (window, converted); - } - - g_free (converted); - g_free (uri); - } - } + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + if (uri != NULL) { + converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL); - gtk_widget_destroy (GTK_WIDGET (dialog)); + if (converted != NULL) { + ephy_window_load_url (window, converted); + } + + g_free (converted); + g_free (uri); + } + } + + gtk_widget_destroy (GTK_WIDGET (dialog)); } static void save_response_cb (GtkDialog *dialog, int response, EphyEmbed *embed) { - if (response == GTK_RESPONSE_ACCEPT) - { - char *uri, *converted; + if (response == GTK_RESPONSE_ACCEPT) { + char *uri, *converted; - uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); - if (uri != NULL) - { - converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL); + uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog)); + if (uri != NULL) { + converted = g_filename_to_utf8 (uri, -1, NULL, NULL, NULL); - if (converted != NULL) - { - EphyWebView *web_view = ephy_embed_get_web_view (embed); - ephy_web_view_save (web_view, converted); - } + if (converted != NULL) { + EphyWebView *web_view = ephy_embed_get_web_view (embed); + ephy_web_view_save (web_view, converted); + } - g_free (converted); - g_free (uri); - } - } + g_free (converted); + g_free (uri); + } + } - gtk_widget_destroy (GTK_WIDGET (dialog)); + gtk_widget_destroy (GTK_WIDGET (dialog)); } void -window_cmd_file_open (GtkAction *action, - EphyWindow *window) +window_cmd_file_open (GtkAction *action, + EphyWindow *window) { - EphyFileChooser *dialog; + EphyFileChooser *dialog; - dialog = ephy_file_chooser_new (_("Open"), - GTK_WIDGET (window), - GTK_FILE_CHOOSER_ACTION_OPEN, - EPHY_FILE_FILTER_ALL_SUPPORTED); + dialog = ephy_file_chooser_new (_("Open"), + GTK_WIDGET (window), + GTK_FILE_CHOOSER_ACTION_OPEN, + EPHY_FILE_FILTER_ALL_SUPPORTED); - g_signal_connect (dialog, "response", - G_CALLBACK (open_response_cb), window); + g_signal_connect (dialog, "response", + G_CALLBACK (open_response_cb), window); - gtk_widget_show (GTK_WIDGET (dialog)); + gtk_widget_show (GTK_WIDGET (dialog)); } static char * get_suggested_filename (EphyEmbed *embed) { - EphyWebView *view; - char *suggested_filename = NULL; - const char *mimetype; - WebKitURIResponse *response; - WebKitWebResource *web_resource; - - view = ephy_embed_get_web_view (embed); - web_resource = webkit_web_view_get_main_resource (WEBKIT_WEB_VIEW (view)); - response = webkit_web_resource_get_response (web_resource); - mimetype = webkit_uri_response_get_mime_type (response); - - if ((g_ascii_strncasecmp (mimetype, "text/html", 9)) == 0) - { - /* Web Title will be used as suggested filename */ - suggested_filename = g_strconcat (ephy_embed_get_title (embed), ".mhtml", NULL); - } - else - { - suggested_filename = g_strdup (webkit_uri_response_get_suggested_filename (response)); - if (!suggested_filename) - { - SoupURI *soup_uri = soup_uri_new (webkit_web_resource_get_uri (web_resource)); - suggested_filename = g_path_get_basename (soup_uri->path); - soup_uri_free (soup_uri); - } - } - - return suggested_filename; + EphyWebView *view; + char *suggested_filename = NULL; + const char *mimetype; + WebKitURIResponse *response; + WebKitWebResource *web_resource; + + view = ephy_embed_get_web_view (embed); + web_resource = webkit_web_view_get_main_resource (WEBKIT_WEB_VIEW (view)); + response = webkit_web_resource_get_response (web_resource); + mimetype = webkit_uri_response_get_mime_type (response); + + if ((g_ascii_strncasecmp (mimetype, "text/html", 9)) == 0) { + /* Web Title will be used as suggested filename */ + suggested_filename = g_strconcat (ephy_embed_get_title (embed), ".mhtml", NULL); + } else { + suggested_filename = g_strdup (webkit_uri_response_get_suggested_filename (response)); + if (!suggested_filename) { + SoupURI *soup_uri = soup_uri_new (webkit_web_resource_get_uri (web_resource)); + suggested_filename = g_path_get_basename (soup_uri->path); + soup_uri_free (soup_uri); + } + } + + return suggested_filename; } void -window_cmd_file_save_as (GtkAction *action, - EphyWindow *window) +window_cmd_file_save_as (GtkAction *action, + EphyWindow *window) { - EphyEmbed *embed; - EphyFileChooser *dialog; - char *suggested_filename; + EphyEmbed *embed; + EphyFileChooser *dialog; + char *suggested_filename; - embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - dialog = ephy_file_chooser_new (_("Save"), - GTK_WIDGET (window), - GTK_FILE_CHOOSER_ACTION_SAVE, - EPHY_FILE_FILTER_NONE); + dialog = ephy_file_chooser_new (_("Save"), + GTK_WIDGET (window), + GTK_FILE_CHOOSER_ACTION_SAVE, + EPHY_FILE_FILTER_NONE); - gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); - suggested_filename = ephy_sanitize_filename (get_suggested_filename (embed)); + suggested_filename = ephy_sanitize_filename (get_suggested_filename (embed)); - gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_filename); - g_free (suggested_filename); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), suggested_filename); + g_free (suggested_filename); - g_signal_connect (dialog, "response", - G_CALLBACK (save_response_cb), embed); + g_signal_connect (dialog, "response", + G_CALLBACK (save_response_cb), embed); - gtk_widget_show (GTK_WIDGET (dialog)); + gtk_widget_show (GTK_WIDGET (dialog)); } typedef struct { - EphyWebView *view; - GtkWidget *image; - GtkWidget *entry; - GtkWidget *spinner; - GtkWidget *spinner_box; - GtkWidget *box; - char *icon_href; - GdkRGBA icon_rgba; + EphyWebView *view; + GtkWidget *image; + GtkWidget *entry; + GtkWidget *spinner; + GtkWidget *spinner_box; + GtkWidget *box; + char *icon_href; + GdkRGBA icon_rgba; } EphyApplicationDialogData; static void ephy_application_dialog_data_free (EphyApplicationDialogData *data) { - g_free (data->icon_href); - g_slice_free (EphyApplicationDialogData, data); + g_free (data->icon_href); + g_slice_free (EphyApplicationDialogData, data); } static void @@ -369,329 +351,321 @@ rounded_rectangle (cairo_t *cr, gdouble width, gdouble height) { - gdouble radius; - gdouble degrees; - - radius = corner_radius / aspect; - degrees = G_PI / 180.0; - - cairo_new_sub_path (cr); - cairo_arc (cr, - x + width - radius, - y + radius, - radius, - -90 * degrees, - 0 * degrees); - cairo_arc (cr, - x + width - radius, - y + height - radius, - radius, - 0 * degrees, - 90 * degrees); - cairo_arc (cr, - x + radius, - y + height - radius, - radius, - 90 * degrees, - 180 * degrees); - cairo_arc (cr, - x + radius, - y + radius, - radius, - 180 * degrees, - 270 * degrees); - cairo_close_path (cr); + gdouble radius; + gdouble degrees; + + radius = corner_radius / aspect; + degrees = G_PI / 180.0; + + cairo_new_sub_path (cr); + cairo_arc (cr, + x + width - radius, + y + radius, + radius, + -90 * degrees, + 0 * degrees); + cairo_arc (cr, + x + width - radius, + y + height - radius, + radius, + 0 * degrees, + 90 * degrees); + cairo_arc (cr, + x + radius, + y + height - radius, + radius, + 90 * degrees, + 180 * degrees); + cairo_arc (cr, + x + radius, + y + radius, + radius, + 180 * degrees, + 270 * degrees); + cairo_close_path (cr); } static GdkPixbuf * -frame_pixbuf (GdkPixbuf *pixbuf, - GdkRGBA *rgba, - int width, - int height) -{ - GdkPixbuf *framed; - cairo_surface_t *surface; - cairo_t *cr; - int frame_width; - int radius; - - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, - width, height); - cr = cairo_create (surface); - - frame_width = 0; - radius = 20; - - rounded_rectangle (cr, - 1.0, - frame_width + 0.5, - frame_width + 0.5, - radius, - width - frame_width * 2 - 1, - height - frame_width * 2 - 1); - if (rgba != NULL) - cairo_set_source_rgba (cr, - rgba->red, - rgba->green, - rgba->blue, - rgba->alpha); - else - cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 0.3); - cairo_fill_preserve (cr); - - if (pixbuf != NULL) { - GdkPixbuf *scaled; - int w; - int h; - - w = gdk_pixbuf_get_width (pixbuf); - h = gdk_pixbuf_get_height (pixbuf); - - if (w < 48 || h < 48) { - scaled = gdk_pixbuf_scale_simple (pixbuf, w * 3, h * 3, GDK_INTERP_NEAREST); - } else if (w > width || h > height) { - double ws, hs, s; - - ws = (double) width / w; - hs = (double) height / h; - s = MIN (ws, hs); - scaled = gdk_pixbuf_scale_simple (pixbuf, w * s, h * s, GDK_INTERP_BILINEAR); - } else { - scaled = g_object_ref (pixbuf); - } - - w = gdk_pixbuf_get_width (scaled); - h = gdk_pixbuf_get_height (scaled); - - gdk_cairo_set_source_pixbuf (cr, scaled, - (width - w) / 2, - (height - h) / 2); - g_object_unref (scaled); - cairo_fill (cr); - } - - framed = gdk_pixbuf_get_from_surface (surface, 0, 0, width, height); - cairo_destroy (cr); - cairo_surface_destroy (surface); - - return framed; +frame_pixbuf (GdkPixbuf *pixbuf, + GdkRGBA *rgba, + int width, + int height) +{ + GdkPixbuf *framed; + cairo_surface_t *surface; + cairo_t *cr; + int frame_width; + int radius; + + surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, + width, height); + cr = cairo_create (surface); + + frame_width = 0; + radius = 20; + + rounded_rectangle (cr, + 1.0, + frame_width + 0.5, + frame_width + 0.5, + radius, + width - frame_width * 2 - 1, + height - frame_width * 2 - 1); + if (rgba != NULL) + cairo_set_source_rgba (cr, + rgba->red, + rgba->green, + rgba->blue, + rgba->alpha); + else + cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 0.3); + cairo_fill_preserve (cr); + + if (pixbuf != NULL) { + GdkPixbuf *scaled; + int w; + int h; + + w = gdk_pixbuf_get_width (pixbuf); + h = gdk_pixbuf_get_height (pixbuf); + + if (w < 48 || h < 48) { + scaled = gdk_pixbuf_scale_simple (pixbuf, w * 3, h * 3, GDK_INTERP_NEAREST); + } else if (w > width || h > height) { + double ws, hs, s; + + ws = (double)width / w; + hs = (double)height / h; + s = MIN (ws, hs); + scaled = gdk_pixbuf_scale_simple (pixbuf, w * s, h * s, GDK_INTERP_BILINEAR); + } else { + scaled = g_object_ref (pixbuf); + } + + w = gdk_pixbuf_get_width (scaled); + h = gdk_pixbuf_get_height (scaled); + + gdk_cairo_set_source_pixbuf (cr, scaled, + (width - w) / 2, + (height - h) / 2); + g_object_unref (scaled); + cairo_fill (cr); + } + + framed = gdk_pixbuf_get_from_surface (surface, 0, 0, width, height); + cairo_destroy (cr); + cairo_surface_destroy (surface); + + return framed; } static void set_image_from_favicon (EphyApplicationDialogData *data) { - GdkPixbuf *icon = NULL; - cairo_surface_t *icon_surface = webkit_web_view_get_favicon (WEBKIT_WEB_VIEW (data->view)); + GdkPixbuf *icon = NULL; + cairo_surface_t *icon_surface = webkit_web_view_get_favicon (WEBKIT_WEB_VIEW (data->view)); - if (icon_surface) - icon = ephy_pixbuf_get_from_surface_scaled (icon_surface, 0, 0); + if (icon_surface) + icon = ephy_pixbuf_get_from_surface_scaled (icon_surface, 0, 0); - if (icon != NULL) { - GdkPixbuf *framed; + if (icon != NULL) { + GdkPixbuf *framed; - framed = frame_pixbuf (icon, NULL, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); - g_object_unref (icon); - gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), framed); - g_object_unref (framed); - } + framed = frame_pixbuf (icon, NULL, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); + g_object_unref (icon); + gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), framed); + g_object_unref (framed); + } } static void set_app_icon_from_filename (EphyApplicationDialogData *data, - const char *filename) + const char *filename) { - GdkPixbuf *pixbuf; - GdkPixbuf *framed; + GdkPixbuf *pixbuf; + GdkPixbuf *framed; - pixbuf = gdk_pixbuf_new_from_file (filename, NULL); - if (pixbuf == NULL) - return; + pixbuf = gdk_pixbuf_new_from_file (filename, NULL); + if (pixbuf == NULL) + return; - framed = frame_pixbuf (pixbuf, &data->icon_rgba, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); - g_object_unref (pixbuf); - gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), framed); - g_object_unref (framed); + framed = frame_pixbuf (pixbuf, &data->icon_rgba, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); + g_object_unref (pixbuf); + gtk_image_set_from_pixbuf (GTK_IMAGE (data->image), framed); + g_object_unref (framed); } static void -download_finished_cb (WebKitDownload *download, - EphyApplicationDialogData *data) +download_finished_cb (WebKitDownload *download, + EphyApplicationDialogData *data) { - char *filename; + char *filename; - gtk_widget_show (data->image); + gtk_widget_show (data->image); - filename = g_filename_from_uri (webkit_download_get_destination (download), NULL, NULL); - set_app_icon_from_filename (data, filename); - g_free (filename); + filename = g_filename_from_uri (webkit_download_get_destination (download), NULL, NULL); + set_app_icon_from_filename (data, filename); + g_free (filename); } static void -download_failed_cb (WebKitDownload *download, - GError *error, - EphyApplicationDialogData *data) +download_failed_cb (WebKitDownload *download, + GError *error, + EphyApplicationDialogData *data) { - gtk_widget_show (data->image); + gtk_widget_show (data->image); - g_signal_handlers_disconnect_by_func (download, download_finished_cb, data); - /* Something happened, default to a page snapshot. */ - set_image_from_favicon (data); + g_signal_handlers_disconnect_by_func (download, download_finished_cb, data); + /* Something happened, default to a page snapshot. */ + set_image_from_favicon (data); } static void download_icon_and_set_image (EphyApplicationDialogData *data) { - WebKitDownload *download; - char *destination, *destination_uri, *tmp_filename; - EphyEmbedShell *shell = ephy_embed_shell_get_default (); - - download = webkit_web_context_download_uri (ephy_embed_shell_get_web_context (shell), - data->icon_href); - /* We do not want this download to show up in the UI, so let's - * set 'ephy-download-set' to make Epiphany think this is - * already there. */ - /* FIXME: it's probably better to just do this in a clean way - * instead of using this workaround. */ - g_object_set_data (G_OBJECT (download), "ephy-download-set", GINT_TO_POINTER (TRUE)); - - tmp_filename = ephy_file_tmp_filename (".ephy-download-XXXXXX", NULL); - destination = g_build_filename (ephy_file_tmp_dir (), tmp_filename, NULL); - destination_uri = g_filename_to_uri (destination, NULL, NULL); - webkit_download_set_destination (download, destination_uri); - g_free (destination); - g_free (destination_uri); - g_free (tmp_filename); - - g_signal_connect (download, "finished", - G_CALLBACK (download_finished_cb), data); - g_signal_connect (download, "failed", - G_CALLBACK (download_failed_cb), data); + WebKitDownload *download; + char *destination, *destination_uri, *tmp_filename; + EphyEmbedShell *shell = ephy_embed_shell_get_default (); + + download = webkit_web_context_download_uri (ephy_embed_shell_get_web_context (shell), + data->icon_href); + /* We do not want this download to show up in the UI, so let's + * set 'ephy-download-set' to make Epiphany think this is + * already there. */ + /* FIXME: it's probably better to just do this in a clean way + * instead of using this workaround. */ + g_object_set_data (G_OBJECT (download), "ephy-download-set", GINT_TO_POINTER (TRUE)); + + tmp_filename = ephy_file_tmp_filename (".ephy-download-XXXXXX", NULL); + destination = g_build_filename (ephy_file_tmp_dir (), tmp_filename, NULL); + destination_uri = g_filename_to_uri (destination, NULL, NULL); + webkit_download_set_destination (download, destination_uri); + g_free (destination); + g_free (destination_uri); + g_free (tmp_filename); + + g_signal_connect (download, "finished", + G_CALLBACK (download_finished_cb), data); + g_signal_connect (download, "failed", + G_CALLBACK (download_failed_cb), data); } static void -fill_default_application_image_cb (GObject *source, - GAsyncResult *async_result, - gpointer user_data) -{ - EphyApplicationDialogData *data = user_data; - char *uri = NULL; - GdkRGBA color = { 0.5, 0.5, 0.5, 0.3 }; - gboolean res = FALSE; - - ephy_web_view_get_best_web_app_icon_finish (EPHY_WEB_VIEW (source), async_result, &res, &uri, &color, NULL); - - data->icon_href = uri; - data->icon_rgba = color; - if (res) - { - download_icon_and_set_image (data); - } - else - { - gtk_widget_show (data->image); - set_image_from_favicon (data); - } +fill_default_application_image_cb (GObject *source, + GAsyncResult *async_result, + gpointer user_data) +{ + EphyApplicationDialogData *data = user_data; + char *uri = NULL; + GdkRGBA color = { 0.5, 0.5, 0.5, 0.3 }; + gboolean res = FALSE; + + ephy_web_view_get_best_web_app_icon_finish (EPHY_WEB_VIEW (source), async_result, &res, &uri, &color, NULL); + + data->icon_href = uri; + data->icon_rgba = color; + if (res) { + download_icon_and_set_image (data); + } else { + gtk_widget_show (data->image); + set_image_from_favicon (data); + } } static void fill_default_application_image (EphyApplicationDialogData *data) { - ephy_web_view_get_best_web_app_icon (data->view, NULL, fill_default_application_image_cb, data); + ephy_web_view_get_best_web_app_icon (data->view, NULL, fill_default_application_image_cb, data); } typedef struct { - const char *host; - const char *name; + const char *host; + const char *name; } SiteInfo; static SiteInfo sites[] = { - { "www.facebook.com", "Facebook" }, - { "twitter.com", "Twitter" }, - { "gmail.com", "GMail" }, - { "plus.google.com", "Google+" }, - { "youtube.com", "YouTube" }, + { "www.facebook.com", "Facebook" }, + { "twitter.com", "Twitter" }, + { "gmail.com", "GMail" }, + { "plus.google.com", "Google+" }, + { "youtube.com", "YouTube" }, }; static char * get_special_case_application_title_for_host (const char *host) { - char *title = NULL; - guint i; + char *title = NULL; + guint i; - for (i = 0; i < G_N_ELEMENTS (sites) && title == NULL; i++) - { - SiteInfo *info = &sites[i]; - if (strcmp (host, info->host) == 0) - { - title = g_strdup (info->name); - } - } + for (i = 0; i < G_N_ELEMENTS (sites) && title == NULL; i++) { + SiteInfo *info = &sites[i]; + if (strcmp (host, info->host) == 0) { + title = g_strdup (info->name); + } + } - return title; + return title; } static void set_default_application_title (EphyApplicationDialogData *data, - char *title) + char *title) { - if (title == NULL || title[0] == '\0') - { - SoupURI *uri; - const char *host; + if (title == NULL || title[0] == '\0') { + SoupURI *uri; + const char *host; - uri = soup_uri_new (webkit_web_view_get_uri (WEBKIT_WEB_VIEW (data->view))); - host = soup_uri_get_host (uri); + uri = soup_uri_new (webkit_web_view_get_uri (WEBKIT_WEB_VIEW (data->view))); + host = soup_uri_get_host (uri); - if (host != NULL && host[0] != '\0') - title = get_special_case_application_title_for_host (host); + if (host != NULL && host[0] != '\0') + title = get_special_case_application_title_for_host (host); - if (title == NULL || title[0] == '\0') - { - if (g_str_has_prefix (host, "www.")) - title = g_strdup (host + strlen ("www.")); - else - title = g_strdup (host); - } + if (title == NULL || title[0] == '\0') { + if (g_str_has_prefix (host, "www.")) + title = g_strdup (host + strlen ("www.")); + else + title = g_strdup (host); + } - soup_uri_free (uri); - } + soup_uri_free (uri); + } - if (title == NULL || title[0] == '\0') - { - title = g_strdup (webkit_web_view_get_title (WEBKIT_WEB_VIEW (data->view))); - } + if (title == NULL || title[0] == '\0') { + title = g_strdup (webkit_web_view_get_title (WEBKIT_WEB_VIEW (data->view))); + } - gtk_entry_set_text (GTK_ENTRY (data->entry), title); - g_free (title); + gtk_entry_set_text (GTK_ENTRY (data->entry), title); + g_free (title); } static void -fill_default_application_title_cb (GObject *source, - GAsyncResult *async_result, - gpointer user_data) +fill_default_application_title_cb (GObject *source, + GAsyncResult *async_result, + gpointer user_data) { - EphyApplicationDialogData *data = user_data; - char *title; + EphyApplicationDialogData *data = user_data; + char *title; - title = ephy_web_view_get_web_app_title_finish (EPHY_WEB_VIEW (source), async_result, NULL); - set_default_application_title (data, title); + title = ephy_web_view_get_web_app_title_finish (EPHY_WEB_VIEW (source), async_result, NULL); + set_default_application_title (data, title); } static void fill_default_application_title (EphyApplicationDialogData *data) { - ephy_web_view_get_web_app_title (data->view, NULL, fill_default_application_title_cb, data); + ephy_web_view_get_web_app_title (data->view, NULL, fill_default_application_title_cb, data); } static void notify_launch_cb (NotifyNotification *notification, - char *action, - gpointer user_data) + char *action, + gpointer user_data) { - char * desktop_file = user_data; + char *desktop_file = user_data; - ephy_file_launch_desktop_file (desktop_file, NULL, 0, NULL); - g_free (desktop_file); + ephy_file_launch_desktop_file (desktop_file, NULL, 0, NULL); + g_free (desktop_file); } static gboolean @@ -701,20 +675,20 @@ confirm_web_application_overwrite (GtkWindow *parent, const char *title) GtkWidget *dialog; dialog = gtk_message_dialog_new (parent, - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_NONE, - _("A web application named '%s' already exists. Do you want to replace it?"), - title); + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, + _("A web application named '%s' already exists. Do you want to replace it?"), + title); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - _("Cancel"), - GTK_RESPONSE_CANCEL, - _("Replace"), - GTK_RESPONSE_OK, - NULL); + _("Cancel"), + GTK_RESPONSE_CANCEL, + _("Replace"), + GTK_RESPONSE_OK, + NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("An application with the same name already exists. Replacing it will " - "overwrite it.")); + "overwrite it.")); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); response = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -724,981 +698,941 @@ confirm_web_application_overwrite (GtkWindow *parent, const char *title) } static void -dialog_save_as_application_response_cb (GtkDialog *dialog, - gint response, - EphyApplicationDialogData *data) -{ - const char *app_name; - char *desktop_file; - char *message; - NotifyNotification *notification; - - if (response == GTK_RESPONSE_OK) { - app_name = gtk_entry_get_text (GTK_ENTRY (data->entry)); - - if (ephy_web_application_exists (app_name)) - { - if (confirm_web_application_overwrite (GTK_WINDOW (dialog), app_name)) - ephy_web_application_delete (app_name); - else - return; - } - - /* Create Web Application, including a new profile and .desktop file. */ - desktop_file = ephy_web_application_create (webkit_web_view_get_uri (WEBKIT_WEB_VIEW (data->view)), - app_name, - gtk_image_get_pixbuf (GTK_IMAGE (data->image))); - if (desktop_file) - message = g_strdup_printf (_("The application '%s' is ready to be used"), - app_name); - else - message = g_strdup_printf (_("The application '%s' could not be created"), - app_name); - - notification = notify_notification_new (message, - NULL, NULL); - g_free (message); - - if (desktop_file) { - notify_notification_add_action (notification, "launch", _("Launch"), - (NotifyActionCallback)notify_launch_cb, - g_path_get_basename (desktop_file), - NULL); - notify_notification_set_icon_from_pixbuf (notification, gtk_image_get_pixbuf (GTK_IMAGE (data->image))); - g_free (desktop_file); - } - - notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); - notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); - notify_notification_set_hint (notification, "desktop-entry", g_variant_new_string ("epiphany")); - notify_notification_set_hint (notification, "transient", g_variant_new_boolean (TRUE)); - notify_notification_show (notification, NULL); - } - - ephy_application_dialog_data_free (data); - gtk_widget_destroy (GTK_WIDGET (dialog)); +dialog_save_as_application_response_cb (GtkDialog *dialog, + gint response, + EphyApplicationDialogData *data) +{ + const char *app_name; + char *desktop_file; + char *message; + NotifyNotification *notification; + + if (response == GTK_RESPONSE_OK) { + app_name = gtk_entry_get_text (GTK_ENTRY (data->entry)); + + if (ephy_web_application_exists (app_name)) { + if (confirm_web_application_overwrite (GTK_WINDOW (dialog), app_name)) + ephy_web_application_delete (app_name); + else + return; + } + + /* Create Web Application, including a new profile and .desktop file. */ + desktop_file = ephy_web_application_create (webkit_web_view_get_uri (WEBKIT_WEB_VIEW (data->view)), + app_name, + gtk_image_get_pixbuf (GTK_IMAGE (data->image))); + if (desktop_file) + message = g_strdup_printf (_("The application '%s' is ready to be used"), + app_name); + else + message = g_strdup_printf (_("The application '%s' could not be created"), + app_name); + + notification = notify_notification_new (message, + NULL, NULL); + g_free (message); + + if (desktop_file) { + notify_notification_add_action (notification, "launch", _("Launch"), + (NotifyActionCallback)notify_launch_cb, + g_path_get_basename (desktop_file), + NULL); + notify_notification_set_icon_from_pixbuf (notification, gtk_image_get_pixbuf (GTK_IMAGE (data->image))); + g_free (desktop_file); + } + + notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); + notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); + notify_notification_set_hint (notification, "desktop-entry", g_variant_new_string ("epiphany")); + notify_notification_set_hint (notification, "transient", g_variant_new_boolean (TRUE)); + notify_notification_show (notification, NULL); + } + + ephy_application_dialog_data_free (data); + gtk_widget_destroy (GTK_WIDGET (dialog)); } void -window_cmd_file_save_as_application (GtkAction *action, - EphyWindow *window) -{ - EphyEmbed *embed; - GtkWidget *dialog, *box, *image, *entry, *content_area; - GtkWidget *label; - GtkWidget *spinner; - GtkWidget *alignment; - EphyWebView *view; - EphyApplicationDialogData *data; - GdkPixbuf *pixbuf; - GtkStyleContext *context; - char *markup; - - embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); - - view = EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)); - - /* Show dialog with icon, title. */ - dialog = gtk_dialog_new_with_buttons (_("Create Web Application"), - GTK_WINDOW (window), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_USE_HEADER_BAR, - _("_Cancel"), - GTK_RESPONSE_CANCEL, - _("C_reate"), - GTK_RESPONSE_OK, - NULL); - - content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 10); - - box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_container_add (GTK_CONTAINER (content_area), box); - gtk_container_set_border_width (GTK_CONTAINER (box), 5); - - image = gtk_image_new (); - gtk_widget_set_no_show_all (image, TRUE); - gtk_widget_set_size_request (image, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); - gtk_widget_set_margin_bottom (image, 10); - gtk_container_add (GTK_CONTAINER (box), image); - pixbuf = frame_pixbuf (NULL, NULL, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); - g_object_unref (pixbuf); - - alignment = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_widget_set_no_show_all (alignment, TRUE); - gtk_widget_set_size_request (alignment, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); - gtk_container_add (GTK_CONTAINER (box), alignment); - gtk_widget_show (alignment); - - spinner = gtk_spinner_new (); - gtk_widget_set_size_request (spinner, 22, 22); - gtk_spinner_start (GTK_SPINNER (spinner)); - gtk_container_add (GTK_CONTAINER (alignment), spinner); - gtk_widget_show (spinner); - - entry = gtk_entry_new (); - gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0); - - markup = g_strdup_printf ("<small>%s</small>", ephy_web_view_get_display_address (view)); - label = gtk_label_new (NULL); - gtk_label_set_markup (GTK_LABEL (label), markup); - g_free (markup); - gtk_box_pack_end (GTK_BOX (box), label, FALSE, FALSE, 0); - context = gtk_widget_get_style_context (label); - gtk_style_context_add_class (context, "dim-label"); - - data = g_slice_new0 (EphyApplicationDialogData); - data->view = view; - data->image = image; - data->entry = entry; - data->spinner = spinner; - data->spinner_box = alignment; - - g_object_bind_property (image, "visible", data->spinner_box, "visible", G_BINDING_INVERT_BOOLEAN); - - fill_default_application_image (data); - fill_default_application_title (data); - - gtk_widget_show_all (dialog); - - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - g_signal_connect (dialog, "response", - G_CALLBACK (dialog_save_as_application_response_cb), - data); - gtk_widget_show_all (dialog); +window_cmd_file_save_as_application (GtkAction *action, + EphyWindow *window) +{ + EphyEmbed *embed; + GtkWidget *dialog, *box, *image, *entry, *content_area; + GtkWidget *label; + GtkWidget *spinner; + GtkWidget *alignment; + EphyWebView *view; + EphyApplicationDialogData *data; + GdkPixbuf *pixbuf; + GtkStyleContext *context; + char *markup; + + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); + + view = EPHY_WEB_VIEW (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed)); + + /* Show dialog with icon, title. */ + dialog = gtk_dialog_new_with_buttons (_("Create Web Application"), + GTK_WINDOW (window), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_USE_HEADER_BAR, + _("_Cancel"), + GTK_RESPONSE_CANCEL, + _("C_reate"), + GTK_RESPONSE_OK, + NULL); + + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_container_set_border_width (GTK_CONTAINER (dialog), 10); + + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); + gtk_container_add (GTK_CONTAINER (content_area), box); + gtk_container_set_border_width (GTK_CONTAINER (box), 5); + + image = gtk_image_new (); + gtk_widget_set_no_show_all (image, TRUE); + gtk_widget_set_size_request (image, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); + gtk_widget_set_margin_bottom (image, 10); + gtk_container_add (GTK_CONTAINER (box), image); + pixbuf = frame_pixbuf (NULL, NULL, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); + gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); + g_object_unref (pixbuf); + + alignment = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_set_no_show_all (alignment, TRUE); + gtk_widget_set_size_request (alignment, DEFAULT_ICON_SIZE, DEFAULT_ICON_SIZE); + gtk_container_add (GTK_CONTAINER (box), alignment); + gtk_widget_show (alignment); + + spinner = gtk_spinner_new (); + gtk_widget_set_size_request (spinner, 22, 22); + gtk_spinner_start (GTK_SPINNER (spinner)); + gtk_container_add (GTK_CONTAINER (alignment), spinner); + gtk_widget_show (spinner); + + entry = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); + gtk_box_pack_start (GTK_BOX (box), entry, FALSE, FALSE, 0); + + markup = g_strdup_printf ("<small>%s</small>", ephy_web_view_get_display_address (view)); + label = gtk_label_new (NULL); + gtk_label_set_markup (GTK_LABEL (label), markup); + g_free (markup); + gtk_box_pack_end (GTK_BOX (box), label, FALSE, FALSE, 0); + context = gtk_widget_get_style_context (label); + gtk_style_context_add_class (context, "dim-label"); + + data = g_slice_new0 (EphyApplicationDialogData); + data->view = view; + data->image = image; + data->entry = entry; + data->spinner = spinner; + data->spinner_box = alignment; + + g_object_bind_property (image, "visible", data->spinner_box, "visible", G_BINDING_INVERT_BOOLEAN); + + fill_default_application_image (data); + fill_default_application_title (data); + + gtk_widget_show_all (dialog); + + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + g_signal_connect (dialog, "response", + G_CALLBACK (dialog_save_as_application_response_cb), + data); + gtk_widget_show_all (dialog); } void -window_cmd_file_close_window (GtkAction *action, - EphyWindow *window) +window_cmd_file_close_window (GtkAction *action, + EphyWindow *window) { - GtkWidget *notebook; - EphyEmbed *embed; + GtkWidget *notebook; + EphyEmbed *embed; - notebook = ephy_window_get_notebook (window); + notebook = ephy_window_get_notebook (window); - if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN, - EPHY_PREFS_LOCKDOWN_QUIT) && - gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) == 1) - { - return; - } + if (g_settings_get_boolean (EPHY_SETTINGS_LOCKDOWN, + EPHY_PREFS_LOCKDOWN_QUIT) && + gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) == 1) { + return; + } - embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - g_signal_emit_by_name (notebook, "tab-close-request", embed); + g_signal_emit_by_name (notebook, "tab-close-request", embed); } void -window_cmd_file_quit (GtkAction *action, - EphyWindow *window) +window_cmd_file_quit (GtkAction *action, + EphyWindow *window) { - if (ephy_shell_close_all_windows (ephy_shell_get_default ())) - g_application_quit (g_application_get_default ()); + if (ephy_shell_close_all_windows (ephy_shell_get_default ())) + g_application_quit (g_application_get_default ()); } void -window_cmd_file_new_window (GtkAction *action, - EphyWindow *window) +window_cmd_file_new_window (GtkAction *action, + EphyWindow *window) { - EphyEmbed *embed; - EphyWindow *new_window = ephy_window_new (); + EphyEmbed *embed; + EphyWindow *new_window = ephy_window_new (); - embed = ephy_shell_new_tab (ephy_shell_get_default (), - new_window, NULL, 0); - ephy_web_view_load_homepage (ephy_embed_get_web_view (embed)); - ephy_window_activate_location (new_window); + embed = ephy_shell_new_tab (ephy_shell_get_default (), + new_window, NULL, 0); + ephy_web_view_load_homepage (ephy_embed_get_web_view (embed)); + ephy_window_activate_location (new_window); } void -window_cmd_file_new_incognito_window (GtkAction *action, - EphyWindow *window) +window_cmd_file_new_incognito_window (GtkAction *action, + EphyWindow *window) { - ephy_open_incognito_window (NULL); + ephy_open_incognito_window (NULL); } void -window_cmd_edit_undo (GtkAction *action, - EphyWindow *window) -{ - GtkWidget *widget; - GtkWidget *embed; - GtkWidget *location_entry; - - widget = gtk_window_get_focus (GTK_WINDOW (window)); - location_entry = gtk_widget_get_ancestor (widget, EPHY_TYPE_LOCATION_ENTRY); - - if (location_entry) - { - ephy_location_entry_reset (EPHY_LOCATION_ENTRY (location_entry)); - } - else - { - embed = gtk_widget_get_ancestor (widget, EPHY_TYPE_EMBED); - - if (embed) - { - webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (EPHY_EMBED (embed)), "Undo"); - } - } +window_cmd_edit_undo (GtkAction *action, + EphyWindow *window) +{ + GtkWidget *widget; + GtkWidget *embed; + GtkWidget *location_entry; + + widget = gtk_window_get_focus (GTK_WINDOW (window)); + location_entry = gtk_widget_get_ancestor (widget, EPHY_TYPE_LOCATION_ENTRY); + + if (location_entry) { + ephy_location_entry_reset (EPHY_LOCATION_ENTRY (location_entry)); + } else { + embed = gtk_widget_get_ancestor (widget, EPHY_TYPE_EMBED); + + if (embed) { + webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (EPHY_EMBED (embed)), "Undo"); + } + } } void -window_cmd_edit_redo (GtkAction *action, - EphyWindow *window) -{ - GtkWidget *widget; - GtkWidget *embed; - GtkWidget *location_entry; - - widget = gtk_window_get_focus (GTK_WINDOW (window)); - location_entry = gtk_widget_get_ancestor (widget, EPHY_TYPE_LOCATION_ENTRY); - - if (location_entry) - { - ephy_location_entry_undo_reset (EPHY_LOCATION_ENTRY (location_entry)); - } - else - { - embed = gtk_widget_get_ancestor (widget, EPHY_TYPE_EMBED); - if (embed) - { - webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (EPHY_EMBED (embed)), "Redo"); - } - } +window_cmd_edit_redo (GtkAction *action, + EphyWindow *window) +{ + GtkWidget *widget; + GtkWidget *embed; + GtkWidget *location_entry; + + widget = gtk_window_get_focus (GTK_WINDOW (window)); + location_entry = gtk_widget_get_ancestor (widget, EPHY_TYPE_LOCATION_ENTRY); + + if (location_entry) { + ephy_location_entry_undo_reset (EPHY_LOCATION_ENTRY (location_entry)); + } else { + embed = gtk_widget_get_ancestor (widget, EPHY_TYPE_EMBED); + if (embed) { + webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (EPHY_EMBED (embed)), "Redo"); + } + } } void -window_cmd_edit_cut (GtkAction *action, - EphyWindow *window) +window_cmd_edit_cut (GtkAction *action, + EphyWindow *window) { - GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); + GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); - if (GTK_IS_EDITABLE (widget)) - { - gtk_editable_cut_clipboard (GTK_EDITABLE (widget)); - } - else - { - EphyEmbed *embed; - embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + if (GTK_IS_EDITABLE (widget)) { + gtk_editable_cut_clipboard (GTK_EDITABLE (widget)); + } else { + EphyEmbed *embed; + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), WEBKIT_EDITING_COMMAND_CUT); - } + webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), WEBKIT_EDITING_COMMAND_CUT); + } } void -window_cmd_edit_copy (GtkAction *action, - EphyWindow *window) +window_cmd_edit_copy (GtkAction *action, + EphyWindow *window) { - GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); + GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); - if (GTK_IS_EDITABLE (widget)) - { - gtk_editable_copy_clipboard (GTK_EDITABLE (widget)); - } - else - { - EphyEmbed *embed; + if (GTK_IS_EDITABLE (widget)) { + gtk_editable_copy_clipboard (GTK_EDITABLE (widget)); + } else { + EphyEmbed *embed; - embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), WEBKIT_EDITING_COMMAND_COPY); - } + webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), WEBKIT_EDITING_COMMAND_COPY); + } } void -window_cmd_edit_paste (GtkAction *action, - EphyWindow *window) +window_cmd_edit_paste (GtkAction *action, + EphyWindow *window) { - GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); + GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); - if (GTK_IS_EDITABLE (widget)) - { - gtk_editable_paste_clipboard (GTK_EDITABLE (widget)); - } - else - { - EphyEmbed *embed; + if (GTK_IS_EDITABLE (widget)) { + gtk_editable_paste_clipboard (GTK_EDITABLE (widget)); + } else { + EphyEmbed *embed; - embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), WEBKIT_EDITING_COMMAND_PASTE); - } + webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), WEBKIT_EDITING_COMMAND_PASTE); + } } void -window_cmd_edit_delete (GtkAction *action, - EphyWindow *window) +window_cmd_edit_delete (GtkAction *action, + EphyWindow *window) { - GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); + GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); - if (GTK_IS_EDITABLE (widget)) - { - gtk_editable_delete_text (GTK_EDITABLE (widget), 0, -1); - } - else - { - EphyEmbed *embed; + if (GTK_IS_EDITABLE (widget)) { + gtk_editable_delete_text (GTK_EDITABLE (widget), 0, -1); + } else { + EphyEmbed *embed; - embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - /* FIXME: TODO */ + /* FIXME: TODO */ #if 0 - ephy_command_manager_do_command (EPHY_COMMAND_MANAGER (embed), - "cmd_delete"); + ephy_command_manager_do_command (EPHY_COMMAND_MANAGER (embed), + "cmd_delete"); #endif - } + } } void -window_cmd_edit_select_all (GtkAction *action, - EphyWindow *window) +window_cmd_edit_select_all (GtkAction *action, + EphyWindow *window) { - GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); + GtkWidget *widget = gtk_window_get_focus (GTK_WINDOW (window)); - if (GTK_IS_EDITABLE (widget)) - { - gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); - } - else - { - EphyEmbed *embed; + if (GTK_IS_EDITABLE (widget)) { + gtk_editable_select_region (GTK_EDITABLE (widget), 0, -1); + } else { + EphyEmbed *embed; - embed = ephy_embed_container_get_active_child - (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), "SelectAll"); - } + webkit_web_view_execute_editing_command (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), "SelectAll"); + } } void -window_cmd_edit_find (GtkAction *action, - EphyWindow *window) +window_cmd_edit_find (GtkAction *action, + EphyWindow *window) { - EphyFindToolbar *toolbar; - - toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_current_find_toolbar (window)); - ephy_find_toolbar_toggle_state (toolbar); + EphyFindToolbar *toolbar; + + toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_current_find_toolbar (window)); + ephy_find_toolbar_toggle_state (toolbar); } void -window_cmd_edit_find_next (GtkAction *action, - EphyWindow *window) +window_cmd_edit_find_next (GtkAction *action, + EphyWindow *window) { - EphyFindToolbar *toolbar; + EphyFindToolbar *toolbar; - toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_current_find_toolbar (window)); - ephy_find_toolbar_find_next (toolbar); + toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_current_find_toolbar (window)); + ephy_find_toolbar_find_next (toolbar); } void -window_cmd_edit_find_prev (GtkAction *action, - EphyWindow *window) +window_cmd_edit_find_prev (GtkAction *action, + EphyWindow *window) { - EphyFindToolbar *toolbar; + EphyFindToolbar *toolbar; - toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_current_find_toolbar (window)); - ephy_find_toolbar_find_previous (toolbar); + toolbar = EPHY_FIND_TOOLBAR (ephy_window_get_current_find_toolbar (window)); + ephy_find_toolbar_find_previous (toolbar); } void -window_cmd_edit_bookmarks (GtkAction *action, - EphyWindow *window) +window_cmd_edit_bookmarks (GtkAction *action, + EphyWindow *window) { - GtkWidget *bwindow; - - bwindow = ephy_shell_get_bookmarks_editor (ephy_shell_get_default ()); - gtk_window_present (GTK_WINDOW (bwindow)); + GtkWidget *bwindow; + + bwindow = ephy_shell_get_bookmarks_editor (ephy_shell_get_default ()); + gtk_window_present (GTK_WINDOW (bwindow)); } void -window_cmd_edit_history (GtkAction *action, - EphyWindow *window) +window_cmd_edit_history (GtkAction *action, + EphyWindow *window) { - GtkWidget *hwindow; - - hwindow = ephy_shell_get_history_window (ephy_shell_get_default ()); + GtkWidget *hwindow; + + hwindow = ephy_shell_get_history_window (ephy_shell_get_default ()); - if (GTK_WINDOW (window) != gtk_window_get_transient_for (GTK_WINDOW (hwindow))) - gtk_window_set_transient_for (GTK_WINDOW (hwindow), - GTK_WINDOW (window)); - gtk_window_present (GTK_WINDOW (hwindow)); + if (GTK_WINDOW (window) != gtk_window_get_transient_for (GTK_WINDOW (hwindow))) + gtk_window_set_transient_for (GTK_WINDOW (hwindow), + GTK_WINDOW (window)); + gtk_window_present (GTK_WINDOW (hwindow)); } void -window_cmd_edit_preferences (GtkAction *action, - EphyWindow *window) +window_cmd_edit_preferences (GtkAction *action, + EphyWindow *window) { - GtkWindow *dialog; - - dialog = GTK_WINDOW (ephy_shell_get_prefs_dialog (ephy_shell_get_default ())); + GtkWindow *dialog; - if (GTK_WINDOW (window) != gtk_window_get_transient_for (dialog)) - gtk_window_set_transient_for (dialog, - GTK_WINDOW (window)); + dialog = GTK_WINDOW (ephy_shell_get_prefs_dialog (ephy_shell_get_default ())); - gtk_window_present (dialog); + if (GTK_WINDOW (window) != gtk_window_get_transient_for (dialog)) + gtk_window_set_transient_for (dialog, + GTK_WINDOW (window)); + + gtk_window_present (dialog); } void -window_cmd_view_fullscreen (GtkAction *action, - EphyWindow *window) +window_cmd_view_fullscreen (GtkAction *action, + EphyWindow *window) { - if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) - gtk_window_fullscreen (GTK_WINDOW (window)); - else - gtk_window_unfullscreen (GTK_WINDOW (window)); + if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) + gtk_window_fullscreen (GTK_WINDOW (window)); + else + gtk_window_unfullscreen (GTK_WINDOW (window)); } void -window_cmd_view_zoom_in (GtkAction *action, - EphyWindow *window) +window_cmd_view_zoom_in (GtkAction *action, + EphyWindow *window) { - ephy_window_set_zoom (window, ZOOM_IN); + ephy_window_set_zoom (window, ZOOM_IN); } void -window_cmd_view_zoom_out (GtkAction *action, - EphyWindow *window) +window_cmd_view_zoom_out (GtkAction *action, + EphyWindow *window) { - ephy_window_set_zoom (window, ZOOM_OUT); + ephy_window_set_zoom (window, ZOOM_OUT); } void -window_cmd_view_zoom_normal (GtkAction *action, - EphyWindow *window) +window_cmd_view_zoom_normal (GtkAction *action, + EphyWindow *window) { - ephy_window_set_zoom (window, 1.0); + ephy_window_set_zoom (window, 1.0); } static void view_source_embedded (const char *uri, EphyEmbed *embed) { - EphyEmbed *new_embed; + EphyEmbed *new_embed; - new_embed = ephy_shell_new_tab - (ephy_shell_get_default (), - EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (embed))), - embed, - EPHY_NEW_TAB_JUMP | EPHY_NEW_TAB_APPEND_AFTER); + new_embed = ephy_shell_new_tab + (ephy_shell_get_default (), + EPHY_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (embed))), + embed, + EPHY_NEW_TAB_JUMP | EPHY_NEW_TAB_APPEND_AFTER); - /* FIXME: Implement embedded view source mode using a custom URI handler and a - * javascript library for the syntax highlighting. - * https://bugzilla.gnome.org/show_bug.cgi?id=731558 - */ - webkit_web_view_load_uri - (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (new_embed), uri); - gtk_widget_grab_focus (GTK_WIDGET (new_embed)); + /* FIXME: Implement embedded view source mode using a custom URI handler and a + * javascript library for the syntax highlighting. + * https://bugzilla.gnome.org/show_bug.cgi?id=731558 + */ + webkit_web_view_load_uri + (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (new_embed), uri); + gtk_widget_grab_focus (GTK_WIDGET (new_embed)); } static void save_temp_source_close_cb (GOutputStream *ostream, GAsyncResult *result, gpointer data) { - const char *uri; - GFile *file; - GError *error = NULL; + const char *uri; + GFile *file; + GError *error = NULL; - g_output_stream_close_finish (ostream, result, &error); - if (error) - { - g_warning ("Unable to close file: %s", error->message); - g_error_free (error); - return; - } + g_output_stream_close_finish (ostream, result, &error); + if (error) { + g_warning ("Unable to close file: %s", error->message); + g_error_free (error); + return; + } - uri = (const char*)g_object_get_data (G_OBJECT (ostream), "ephy-save-temp-source-uri"); + uri = (const char *)g_object_get_data (G_OBJECT (ostream), "ephy-save-temp-source-uri"); - file = g_file_new_for_uri (uri); + file = g_file_new_for_uri (uri); - if (!ephy_file_launch_handler ("text/plain", file, gtk_get_current_event_time ())) - { - /* Fallback to view the source inside the browser */ - EphyEmbed *embed; + if (!ephy_file_launch_handler ("text/plain", file, gtk_get_current_event_time ())) { + /* Fallback to view the source inside the browser */ + EphyEmbed *embed; - uri = (const char*) g_object_get_data (G_OBJECT (ostream), - "ephy-original-source-uri"); - embed = (EphyEmbed*)g_object_get_data (G_OBJECT (ostream), - "ephy-save-temp-source-embed"); - view_source_embedded (uri, embed); - } - g_object_unref (ostream); + uri = (const char *)g_object_get_data (G_OBJECT (ostream), + "ephy-original-source-uri"); + embed = (EphyEmbed *)g_object_get_data (G_OBJECT (ostream), + "ephy-save-temp-source-embed"); + view_source_embedded (uri, embed); + } + g_object_unref (ostream); - g_object_unref (file); + g_object_unref (file); } static void save_temp_source_write_cb (GOutputStream *ostream, GAsyncResult *result, GString *data) { - GError *error = NULL; - gssize written; + GError *error = NULL; + gssize written; - written = g_output_stream_write_finish (ostream, result, &error); - if (error) - { - g_string_free (data, TRUE); - g_warning ("Unable to write to file: %s", error->message); - g_error_free (error); + written = g_output_stream_write_finish (ostream, result, &error); + if (error) { + g_string_free (data, TRUE); + g_warning ("Unable to write to file: %s", error->message); + g_error_free (error); - g_output_stream_close_async (ostream, G_PRIORITY_DEFAULT, NULL, - (GAsyncReadyCallback)save_temp_source_close_cb, - NULL); + g_output_stream_close_async (ostream, G_PRIORITY_DEFAULT, NULL, + (GAsyncReadyCallback)save_temp_source_close_cb, + NULL); - return; - } + return; + } - if (written == (gint)data->len) - { - g_string_free (data, TRUE); + if (written == (gint)data->len) { + g_string_free (data, TRUE); - g_output_stream_close_async (ostream, G_PRIORITY_DEFAULT, NULL, - (GAsyncReadyCallback)save_temp_source_close_cb, - NULL); + g_output_stream_close_async (ostream, G_PRIORITY_DEFAULT, NULL, + (GAsyncReadyCallback)save_temp_source_close_cb, + NULL); - return; - } + return; + } - data->len -= written; - data->str += written; + data->len -= written; + data->str += written; - g_output_stream_write_async (ostream, - data->str, data->len, - G_PRIORITY_DEFAULT, NULL, - (GAsyncReadyCallback)save_temp_source_write_cb, - data); + g_output_stream_write_async (ostream, + data->str, data->len, + G_PRIORITY_DEFAULT, NULL, + (GAsyncReadyCallback)save_temp_source_write_cb, + data); } static void get_main_resource_data_cb (WebKitWebResource *resource, GAsyncResult *result, GOutputStream *ostream) { - guchar *data; - gsize data_length; - GString *data_str; - GError *error = NULL; + guchar *data; + gsize data_length; + GString *data_str; + GError *error = NULL; - data = webkit_web_resource_get_data_finish (resource, result, &data_length, &error); - if (error) { - g_warning ("Unable to get main resource data: %s", error->message); - g_error_free (error); - return; - } + data = webkit_web_resource_get_data_finish (resource, result, &data_length, &error); + if (error) { + g_warning ("Unable to get main resource data: %s", error->message); + g_error_free (error); + return; + } - /* We create a new GString here because we need to make sure - * we keep writing in case of partial writes */ - data_str = g_string_new_len ((gchar *)data, data_length); - g_free (data); + /* We create a new GString here because we need to make sure + * we keep writing in case of partial writes */ + data_str = g_string_new_len ((gchar *)data, data_length); + g_free (data); - g_output_stream_write_async (ostream, - data_str->str, data_str->len, - G_PRIORITY_DEFAULT, NULL, - (GAsyncReadyCallback)save_temp_source_write_cb, - data_str); + g_output_stream_write_async (ostream, + data_str->str, data_str->len, + G_PRIORITY_DEFAULT, NULL, + (GAsyncReadyCallback)save_temp_source_write_cb, + data_str); } static void save_temp_source_replace_cb (GFile *file, GAsyncResult *result, EphyEmbed *embed) { - EphyWebView *view; - WebKitWebResource *resource; - GFileOutputStream *ostream; - GError *error = NULL; + EphyWebView *view; + WebKitWebResource *resource; + GFileOutputStream *ostream; + GError *error = NULL; - ostream = g_file_replace_finish (file, result, &error); - if (error) - { - g_warning ("Unable to replace file: %s", error->message); - g_error_free (error); - return; - } + ostream = g_file_replace_finish (file, result, &error); + if (error) { + g_warning ("Unable to replace file: %s", error->message); + g_error_free (error); + return; + } - g_object_set_data_full (G_OBJECT (ostream), - "ephy-save-temp-source-uri", - g_file_get_uri (file), - g_free); + g_object_set_data_full (G_OBJECT (ostream), + "ephy-save-temp-source-uri", + g_file_get_uri (file), + g_free); - view = ephy_embed_get_web_view (embed); + view = ephy_embed_get_web_view (embed); - g_object_set_data_full (G_OBJECT (ostream), - "ephy-original-source-uri", - g_strdup (webkit_web_view_get_uri (WEBKIT_WEB_VIEW (view))), - g_free), + g_object_set_data_full (G_OBJECT (ostream), + "ephy-original-source-uri", + g_strdup (webkit_web_view_get_uri (WEBKIT_WEB_VIEW (view))), + g_free), - g_object_set_data_full (G_OBJECT (ostream), - "ephy-save-temp-source-embed", - g_object_ref (embed), - g_object_unref); + g_object_set_data_full (G_OBJECT (ostream), + "ephy-save-temp-source-embed", + g_object_ref (embed), + g_object_unref); - resource = webkit_web_view_get_main_resource (WEBKIT_WEB_VIEW (view)); - webkit_web_resource_get_data (resource, NULL, - (GAsyncReadyCallback)get_main_resource_data_cb, - ostream); + resource = webkit_web_view_get_main_resource (WEBKIT_WEB_VIEW (view)); + webkit_web_resource_get_data (resource, NULL, + (GAsyncReadyCallback)get_main_resource_data_cb, + ostream); } static void save_temp_source (EphyEmbed *embed, - guint32 user_time) + guint32 user_time) { - GFile *file; - char *tmp, *base; - const char *static_temp_dir; + GFile *file; + char *tmp, *base; + const char *static_temp_dir; - static_temp_dir = ephy_file_tmp_dir (); - if (static_temp_dir == NULL) - { - return; - } + static_temp_dir = ephy_file_tmp_dir (); + if (static_temp_dir == NULL) { + return; + } - base = g_build_filename (static_temp_dir, "viewsourceXXXXXX", NULL); - tmp = ephy_file_tmp_filename (base, "html"); - g_free (base); - if (tmp == NULL) - { - return; - } + base = g_build_filename (static_temp_dir, "viewsourceXXXXXX", NULL); + tmp = ephy_file_tmp_filename (base, "html"); + g_free (base); + if (tmp == NULL) { + return; + } - file = g_file_new_for_path (tmp); - g_file_replace_async (file, NULL, FALSE, - G_FILE_CREATE_REPLACE_DESTINATION|G_FILE_CREATE_PRIVATE, - G_PRIORITY_DEFAULT, NULL, - (GAsyncReadyCallback)save_temp_source_replace_cb, - embed); + file = g_file_new_for_path (tmp); + g_file_replace_async (file, NULL, FALSE, + G_FILE_CREATE_REPLACE_DESTINATION | G_FILE_CREATE_PRIVATE, + G_PRIORITY_DEFAULT, NULL, + (GAsyncReadyCallback)save_temp_source_replace_cb, + embed); - g_object_unref (file); - g_free (tmp); + g_object_unref (file); + g_free (tmp); } void -window_cmd_view_page_source (GtkAction *action, - EphyWindow *window) +window_cmd_view_page_source (GtkAction *action, + EphyWindow *window) { - EphyEmbed *embed; - const char *address; - guint32 user_time; + EphyEmbed *embed; + const char *address; + guint32 user_time; - embed = ephy_embed_container_get_active_child - (EPHY_EMBED_CONTAINER (window)); - g_return_if_fail (embed != NULL); + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); + g_return_if_fail (embed != NULL); - address = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); + address = ephy_web_view_get_address (ephy_embed_get_web_view (embed)); #if 0 -FIXME: Disabled due to bug #738475 - - if (g_settings_get_boolean (EPHY_SETTINGS_MAIN, - EPHY_PREFS_INTERNAL_VIEW_SOURCE)) - { - view_source_embedded (address, embed); - return; - } + FIXME: Disabled due to bug #738475 + + if (g_settings_get_boolean (EPHY_SETTINGS_MAIN, + EPHY_PREFS_INTERNAL_VIEW_SOURCE)) { + view_source_embedded (address, embed); + return; + } #endif - user_time = gtk_get_current_event_time (); + user_time = gtk_get_current_event_time (); + + if (g_str_has_prefix (address, "file://")) { + GFile *file; + + file = g_file_new_for_uri (address); + ephy_file_launch_handler ("text/plain", file, user_time); - if (g_str_has_prefix (address, "file://")) - { - GFile *file; - - file = g_file_new_for_uri (address); - ephy_file_launch_handler ("text/plain", file, user_time); - - g_object_unref (file); - } - else - { - save_temp_source (embed, user_time); - } + g_object_unref (file); + } else { + save_temp_source (embed, user_time); + } } void window_cmd_help_contents (GtkAction *action, - GtkWidget *window) + GtkWidget *window) { - ephy_gui_help (window, NULL); + ephy_gui_help (window, NULL); } #define ABOUT_GROUP "About" void window_cmd_help_about (GtkAction *action, - GtkWidget *window) -{ - char *comments = NULL; - GKeyFile *key_file; - GError *error = NULL; - char **list, **authors, **contributors, **past_authors, **artists, **documenters; - gsize n_authors, n_contributors, n_past_authors, n_artists, n_documenters, i, j; - - key_file = g_key_file_new (); - if (!g_key_file_load_from_file (key_file, DATADIR G_DIR_SEPARATOR_S "about.ini", - 0, &error)) - { - g_warning ("Couldn't load about data: %s\n", error->message); - g_error_free (error); - return; - } - - list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors", - &n_authors, NULL); - contributors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Contributors", - &n_contributors, NULL); - past_authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "PastAuthors", - &n_past_authors, NULL); - -#define APPEND(_to,_from) \ - _to[i++] = g_strdup (_from); - -#define APPEND_STRV_AND_FREE(_to,_from) \ - if (_from)\ - {\ - for (j = 0; _from[j] != NULL; ++j)\ - {\ - _to[i++] = _from[j];\ - }\ - g_free (_from);\ - } - - authors = g_new (char *, (list ? n_authors : 0) + - (contributors ? n_contributors : 0) + - (past_authors ? n_past_authors : 0) + 7 + 1); - i = 0; - APPEND_STRV_AND_FREE (authors, list); - APPEND (authors, ""); - APPEND (authors, _("Contact us at:")); - APPEND (authors, "<epiphany-list@gnome.org>"); - APPEND (authors, ""); - APPEND (authors, _("Contributors:")); - APPEND_STRV_AND_FREE (authors, contributors); - APPEND (authors, ""); - APPEND (authors, _("Past developers:")); - APPEND_STRV_AND_FREE (authors, past_authors); - authors[i++] = NULL; - - list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Artists", &n_artists, NULL); - - artists = g_new (char *, (list ? n_artists : 0) + 4 + 1); - i = 0; - APPEND_STRV_AND_FREE (artists, list); - artists[i++] = NULL; - - list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, NULL); - - documenters = g_new (char *, (list ? n_documenters : 0) + 3 + 1); - i = 0; - APPEND_STRV_AND_FREE (documenters, list); - APPEND (documenters, ""); - APPEND (documenters, _("Contact us at:")); - APPEND (documenters, "<gnome-doc-list@gnome.org>"); - documenters[i++] = NULL; - + GtkWidget *window) +{ + char *comments = NULL; + GKeyFile *key_file; + GError *error = NULL; + char **list, **authors, **contributors, **past_authors, **artists, **documenters; + gsize n_authors, n_contributors, n_past_authors, n_artists, n_documenters, i, j; + + key_file = g_key_file_new (); + if (!g_key_file_load_from_file (key_file, DATADIR G_DIR_SEPARATOR_S "about.ini", + 0, &error)) { + g_warning ("Couldn't load about data: %s\n", error->message); + g_error_free (error); + return; + } + + list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Authors", + &n_authors, NULL); + contributors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Contributors", + &n_contributors, NULL); + past_authors = g_key_file_get_string_list (key_file, ABOUT_GROUP, "PastAuthors", + &n_past_authors, NULL); + +#define APPEND(_to, _from) \ + _to[i++] = g_strdup (_from); + +#define APPEND_STRV_AND_FREE(_to, _from) \ + if (_from) \ + { \ + for (j = 0; _from[j] != NULL; ++j) \ + { \ + _to[i++] = _from[j]; \ + } \ + g_free (_from); \ + } + + authors = g_new (char *, (list ? n_authors : 0) + + (contributors ? n_contributors : 0) + + (past_authors ? n_past_authors : 0) + 7 + 1); + i = 0; + APPEND_STRV_AND_FREE (authors, list); + APPEND (authors, ""); + APPEND (authors, _("Contact us at:")); + APPEND (authors, "<epiphany-list@gnome.org>"); + APPEND (authors, ""); + APPEND (authors, _("Contributors:")); + APPEND_STRV_AND_FREE (authors, contributors); + APPEND (authors, ""); + APPEND (authors, _("Past developers:")); + APPEND_STRV_AND_FREE (authors, past_authors); + authors[i++] = NULL; + + list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Artists", &n_artists, NULL); + + artists = g_new (char *, (list ? n_artists : 0) + 4 + 1); + i = 0; + APPEND_STRV_AND_FREE (artists, list); + artists[i++] = NULL; + + list = g_key_file_get_string_list (key_file, ABOUT_GROUP, "Documenters", &n_documenters, NULL); + + documenters = g_new (char *, (list ? n_documenters : 0) + 3 + 1); + i = 0; + APPEND_STRV_AND_FREE (documenters, list); + APPEND (documenters, ""); + APPEND (documenters, _("Contact us at:")); + APPEND (documenters, "<gnome-doc-list@gnome.org>"); + documenters[i++] = NULL; + #undef APPEND #undef APPEND_STRV_AND_FREE - g_key_file_free (key_file); - - comments = g_strdup_printf (_("A simple, clean, beautiful view of the web.\n" - "Powered by WebKit %d.%d.%d"), - webkit_get_major_version (), - webkit_get_minor_version (), - webkit_get_micro_version ()); - - gtk_show_about_dialog (window ? GTK_WINDOW (window) : NULL, - "program-name", _("Web"), - "version", VERSION, - "copyright", "Copyright © 2002–2004 Marco Pesenti Gritti\n" - "Copyright © 2003–2014 The Web Developers", - "artists", artists, - "authors", authors, - "comments", comments, - "documenters", documenters, - /* Translators: This is a special message that shouldn't be translated - * literally. It is used in the about box to give credits to - * the translators. - * Thus, you should translate it to your name and email address. - * You should also include other translators who have contributed to - * this translation; in that case, please write each of them on a separate - * line seperated by newlines (\n). - */ - "translator-credits", _("translator-credits"), - "logo-icon-name", "web-browser", - "website", "https://wiki.gnome.org/Apps/Web", - "website-label", _("Web Website"), - "license-type", GTK_LICENSE_GPL_2_0, - "wrap-license", TRUE, - NULL); - - g_free (comments); - g_strfreev (artists); - g_strfreev (authors); - g_strfreev (documenters); + g_key_file_free (key_file); + + comments = g_strdup_printf (_("A simple, clean, beautiful view of the web.\n" + "Powered by WebKit %d.%d.%d"), + webkit_get_major_version (), + webkit_get_minor_version (), + webkit_get_micro_version ()); + + gtk_show_about_dialog (window ? GTK_WINDOW (window) : NULL, + "program-name", _("Web"), + "version", VERSION, + "copyright", "Copyright © 2002–2004 Marco Pesenti Gritti\n" + "Copyright © 2003–2014 The Web Developers", + "artists", artists, + "authors", authors, + "comments", comments, + "documenters", documenters, + /* Translators: This is a special message that shouldn't be translated + * literally. It is used in the about box to give credits to + * the translators. + * Thus, you should translate it to your name and email address. + * You should also include other translators who have contributed to + * this translation; in that case, please write each of them on a separate + * line seperated by newlines (\n). + */ + "translator-credits", _("translator-credits"), + "logo-icon-name", "web-browser", + "website", "https://wiki.gnome.org/Apps/Web", + "website-label", _("Web Website"), + "license-type", GTK_LICENSE_GPL_2_0, + "wrap-license", TRUE, + NULL); + + g_free (comments); + g_strfreev (artists); + g_strfreev (authors); + g_strfreev (documenters); } void -window_cmd_tabs_next (GtkAction *action, - EphyWindow *window) +window_cmd_tabs_next (GtkAction *action, + EphyWindow *window) { - GtkWidget *nb; + GtkWidget *nb; - nb = ephy_window_get_notebook (window); - g_return_if_fail (nb != NULL); + nb = ephy_window_get_notebook (window); + g_return_if_fail (nb != NULL); - ephy_notebook_next_page (EPHY_NOTEBOOK (nb)); + ephy_notebook_next_page (EPHY_NOTEBOOK (nb)); } void -window_cmd_tabs_previous (GtkAction *action, - EphyWindow *window) +window_cmd_tabs_previous (GtkAction *action, + EphyWindow *window) { - GtkWidget *nb; + GtkWidget *nb; - nb = ephy_window_get_notebook (window); - g_return_if_fail (nb != NULL); + nb = ephy_window_get_notebook (window); + g_return_if_fail (nb != NULL); - ephy_notebook_prev_page (EPHY_NOTEBOOK (nb)); + ephy_notebook_prev_page (EPHY_NOTEBOOK (nb)); } void -window_cmd_tabs_move_left (GtkAction *action, - EphyWindow *window) +window_cmd_tabs_move_left (GtkAction *action, + EphyWindow *window) { - GtkWidget *child; - GtkNotebook *notebook; - int page; + GtkWidget *child; + GtkNotebook *notebook; + int page; - notebook = GTK_NOTEBOOK (ephy_window_get_notebook (window)); - page = gtk_notebook_get_current_page (notebook); - if (page < 1) return; + notebook = GTK_NOTEBOOK (ephy_window_get_notebook (window)); + page = gtk_notebook_get_current_page (notebook); + if (page < 1) return; - child = gtk_notebook_get_nth_page (notebook, page); - gtk_notebook_reorder_child (notebook, child, page - 1); + child = gtk_notebook_get_nth_page (notebook, page); + gtk_notebook_reorder_child (notebook, child, page - 1); } -void window_cmd_tabs_move_right (GtkAction *action, - EphyWindow *window) +void window_cmd_tabs_move_right (GtkAction *action, + EphyWindow *window) { - GtkWidget *child; - GtkNotebook *notebook; - int page, n_pages; + GtkWidget *child; + GtkNotebook *notebook; + int page, n_pages; - notebook = GTK_NOTEBOOK (ephy_window_get_notebook (window)); - page = gtk_notebook_get_current_page (notebook); - n_pages = gtk_notebook_get_n_pages (notebook) - 1; - if (page > n_pages - 1) return; + notebook = GTK_NOTEBOOK (ephy_window_get_notebook (window)); + page = gtk_notebook_get_current_page (notebook); + n_pages = gtk_notebook_get_n_pages (notebook) - 1; + if (page > n_pages - 1) return; - child = gtk_notebook_get_nth_page (notebook, page); - gtk_notebook_reorder_child (notebook, child, page + 1); + child = gtk_notebook_get_nth_page (notebook, page); + gtk_notebook_reorder_child (notebook, child, page + 1); } void -window_cmd_tabs_detach (GtkAction *action, - EphyWindow *window) +window_cmd_tabs_detach (GtkAction *action, + EphyWindow *window) { - EphyEmbed *embed; - GtkNotebook *notebook; - EphyWindow *new_window; + EphyEmbed *embed; + GtkNotebook *notebook; + EphyWindow *new_window; - notebook = GTK_NOTEBOOK (ephy_window_get_notebook (window)); - if (gtk_notebook_get_n_pages (notebook) <= 1) - return; + notebook = GTK_NOTEBOOK (ephy_window_get_notebook (window)); + if (gtk_notebook_get_n_pages (notebook) <= 1) + return; - embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); + embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - g_object_ref_sink (embed); - gtk_notebook_remove_page (notebook, gtk_notebook_page_num (notebook, GTK_WIDGET (embed))); + g_object_ref_sink (embed); + gtk_notebook_remove_page (notebook, gtk_notebook_page_num (notebook, GTK_WIDGET (embed))); - new_window = ephy_window_new (); - ephy_embed_container_add_child (EPHY_EMBED_CONTAINER (new_window), embed, 0, FALSE); - g_object_unref (embed); + new_window = ephy_window_new (); + ephy_embed_container_add_child (EPHY_EMBED_CONTAINER (new_window), embed, 0, FALSE); + g_object_unref (embed); - gtk_window_present (GTK_WINDOW (new_window)); + gtk_window_present (GTK_WINDOW (new_window)); } void -window_cmd_load_location (GtkAction *action, - EphyWindow *window) +window_cmd_load_location (GtkAction *action, + EphyWindow *window) { - const char *location; + const char *location; - location = ephy_window_get_location (window); + location = ephy_window_get_location (window); - if (location) - { - EphyBookmarks *bookmarks; - char *address; + if (location) { + EphyBookmarks *bookmarks; + char *address; - bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ()); + bookmarks = ephy_shell_get_bookmarks (ephy_shell_get_default ()); - address = ephy_bookmarks_resolve_address (bookmarks, location, NULL); - g_return_if_fail (address != NULL); + address = ephy_bookmarks_resolve_address (bookmarks, location, NULL); + g_return_if_fail (address != NULL); - ephy_link_open (EPHY_LINK (window), address, - ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)), - ephy_link_flags_from_current_event ()); - } + ephy_link_open (EPHY_LINK (window), address, + ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)), + ephy_link_flags_from_current_event ()); + } } void -window_cmd_browse_with_caret (GtkAction *action, - EphyWindow *window) +window_cmd_browse_with_caret (GtkAction *action, + EphyWindow *window) { - gboolean active; - EphyEmbed *embed; + gboolean active; + EphyEmbed *embed; + + embed = ephy_embed_container_get_active_child + (EPHY_EMBED_CONTAINER (window)); - embed = ephy_embed_container_get_active_child - (EPHY_EMBED_CONTAINER (window)); - - active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); - /* FIXME: perhaps a bit of a kludge; we check if there's an - * active embed because we don't want to show the dialog on - * startup when we sync the GtkAction with our GConf - * preference */ - if (active && embed) - { - GtkWidget *dialog; - int response; + /* FIXME: perhaps a bit of a kludge; we check if there's an + * active embed because we don't want to show the dialog on + * startup when we sync the GtkAction with our GConf + * preference */ + if (active && embed) { + GtkWidget *dialog; + int response; - dialog = gtk_message_dialog_new (GTK_WINDOW (window), - GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, - _("Enable caret browsing mode?")); + dialog = gtk_message_dialog_new (GTK_WINDOW (window), + GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, GTK_BUTTONS_CANCEL, + _("Enable caret browsing mode?")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Pressing F7 turns caret browsing on or off. This feature " - "places a moveable cursor in web pages, allowing you to move " - "around with your keyboard. Do you want to enable caret browsing?")); - gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Enable"), GTK_RESPONSE_ACCEPT); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), + _("Pressing F7 turns caret browsing on or off. This feature " + "places a moveable cursor in web pages, allowing you to move " + "around with your keyboard. Do you want to enable caret browsing?")); + gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Enable"), GTK_RESPONSE_ACCEPT); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); - response = gtk_dialog_run (GTK_DIALOG (dialog)); + response = gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_widget_destroy (dialog); - if (response == GTK_RESPONSE_CANCEL) - { - gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); - return; - } - } + if (response == GTK_RESPONSE_CANCEL) { + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), FALSE); + return; + } + } - g_settings_set_boolean (EPHY_SETTINGS_MAIN, - EPHY_PREFS_ENABLE_CARET_BROWSING, active); + g_settings_set_boolean (EPHY_SETTINGS_MAIN, + EPHY_PREFS_ENABLE_CARET_BROWSING, active); } void -window_cmd_view_encoding (GtkAction *action, +window_cmd_view_encoding (GtkAction *action, EphyWindow *window) { - EphyEncodingDialog *dialog; + EphyEncodingDialog *dialog; - dialog = ephy_encoding_dialog_new (window); - gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window)); - gtk_dialog_run (GTK_DIALOG (dialog)); + dialog = ephy_encoding_dialog_new (window); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window)); + gtk_dialog_run (GTK_DIALOG (dialog)); } |