diff options
Diffstat (limited to 'src/file-manager')
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 18 | ||||
| -rw-r--r-- | src/file-manager/fm-icon-view.c | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 7 | ||||
| -rw-r--r-- | src/file-manager/fm-properties-window.c | 4 |
4 files changed, 30 insertions, 6 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 8b1afaaf..9c90a518 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1168,7 +1168,7 @@ pattern_select_response_cb (GtkWidget *dialog, int response, gpointer user_data) case GTK_RESPONSE_HELP : error = NULL; gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - "ghelp:user-guide#caja-select-pattern", + "help:user-guide#caja-select-pattern", gtk_get_current_event_time (), &error); if (error) { eel_show_error_dialog (_("There was an error displaying help."), error->message, @@ -10098,7 +10098,23 @@ fm_directory_view_move_copy_items (const GList *item_uris, if (screen == NULL) { screen = gdk_screen_get_default (); } +#if GTK_CHECK_VERSION (3, 0, 0) + GdkAppLaunchContext *launch_context; + GAppInfo *app_info = NULL; + app_info = g_app_info_create_from_commandline (command, + NULL, + G_APP_INFO_CREATE_NONE, + NULL); + if (app_info != NULL) { + launch_context = gdk_app_launch_context_new (); + gdk_app_launch_context_set_screen (launch_context, screen); + g_app_info_launch (app_info, NULL, G_APP_LAUNCH_CONTEXT (launch_context), NULL); + g_object_unref (launch_context); + g_object_unref (app_info); + } +#else gdk_spawn_command_line_on_screen (screen, command, NULL); +#endif g_free (command); return; diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index c624610a..6ab19c4e 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -2061,7 +2061,7 @@ icon_container_activate_alternate_callback (CajaIconContainer *container, g_assert (FM_IS_ICON_VIEW (icon_view)); g_assert (container == get_icon_container (icon_view)); - open_in_tab = FALSE; + open_in_tab = TRUE; window_info = fm_directory_view_get_caja_window (FM_DIRECTORY_VIEW (icon_view)); @@ -2170,6 +2170,8 @@ audio_child_died (GPid pid, { FMIconView *icon_view; + g_return_if_fail (FM_IS_ICON_VIEW (data)); + icon_view = FM_ICON_VIEW (data); icon_view->details->audio_preview_child_watch = 0; @@ -2637,12 +2639,11 @@ fm_icon_view_icon_text_changed_callback (CajaIconContainer *container, FMIconView *icon_view) { g_assert (CAJA_IS_FILE (file)); - g_assert (new_name != NULL); /* Don't allow a rename with an empty string. Revert to original * without notifying the user. */ - if (new_name[0] == '\0') + if ((new_name == NULL) || (new_name[0] == '\0')) { return; } diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 72e3f55c..c92e0c12 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -1739,7 +1739,14 @@ create_and_set_up_tree_view (FMListView *view) view->details->file_name_column = gtk_tree_view_column_new (); gtk_tree_view_column_set_expand (view->details->file_name_column, TRUE); +#if GTK_CHECK_VERSION (3, 0, 0) + GtkStyleContext *context; + context = gtk_widget_get_style_context (GTK_WIDGET(view)); + font_size = PANGO_PIXELS (pango_font_description_get_size ( + gtk_style_context_get_font (context, GTK_STATE_FLAG_NORMAL))); +#else font_size = PANGO_PIXELS (pango_font_description_get_size (GTK_WIDGET(view)->style->font_desc)); +#endif gtk_tree_view_column_set_min_width (view->details->file_name_column, 20*font_size); g_object_ref_sink (view->details->file_name_column); view->details->file_name_column_num = column_num; diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index a62fbec5..854de866 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -42,7 +42,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include <libmateui/mate-desktop-thumbnail.h> +#include <libmate-desktop/mate-desktop-thumbnail.h> #include <libcaja-extension/caja-property-page-provider.h> #include <libcaja-private/caja-entry.h> #include <libcaja-private/caja-file-attributes.h> @@ -5520,7 +5520,7 @@ real_response (GtkDialog *dialog, switch (response) { case GTK_RESPONSE_HELP: gtk_show_uri (gtk_window_get_screen (GTK_WINDOW (dialog)), - "ghelp:user-guide#goscaja-51", + "help:user-guide#goscaja-51", gtk_get_current_event_time (), &error); if (error != NULL) { |