Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Sat, 29 Oct 2016 14:12:32 UTC Commit: 6cdb1842be9e3a5ff8fe994c44ed212b26575e7b https://github.com/geany/geany/commit/6cdb1842be9e3a5ff8fe994c44ed212b26575e...

Log Message: ----------- VTE: Remove support for background image

It's a more than questionable feature that was dropped in VTE 2.91, so remove it altogether instead of conditionally supporting it.

Modified Paths: -------------- data/geany.glade src/keyfile.c src/prefs.c src/vte.c src/vte.h

Modified: data/geany.glade 76 lines changed, 10 insertions(+), 66 deletions(-) =================================================================== @@ -5858,29 +5858,15 @@ </packing> </child> <child> - <object class="GtkLabel" id="bg_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Background image:</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkLabel" id="terminal_scrollback_lines_label"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Scrollback lines:</property> </object> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -5893,8 +5879,8 @@ <property name="label" translatable="yes">Shell:</property> </object> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> @@ -5934,48 +5920,6 @@ </packing> </child> <child> - <object class="GtkEntry" id="entry_image"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Sets the path to the background image in the terminal widget</property> - <property name="invisible_char">•</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">False</property> - <property name="primary_icon_sensitive">True</property> - <property name="secondary_icon_sensitive">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkButton" id="button_term_image"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <child> - <object class="GtkImage" id="image1337"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-open</property> - <property name="icon-size">1</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkSpinButton" id="spin_scrollback"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -5992,8 +5936,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">3</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -6011,8 +5955,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -6033,8 +5977,8 @@ <packing> <property name="left_attach">2</property> <property name="right_attach">3</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing>

Modified: src/keyfile.c 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -535,7 +535,6 @@ static void save_dialog_prefs(GKeyFile *config) g_key_file_set_boolean(config, "VTE", "cursor_blinks", vc->cursor_blinks); g_key_file_set_integer(config, "VTE", "scrollback_lines", vc->scrollback_lines); g_key_file_set_string(config, "VTE", "font", vc->font); - g_key_file_set_string(config, "VTE", "image", vc->image); g_key_file_set_string(config, "VTE", "shell", vc->shell); tmp_string = utils_get_hex_from_color(&vc->colour_fore); g_key_file_set_string(config, "VTE", "colour_fore", tmp_string); @@ -879,7 +878,6 @@ static void load_dialog_prefs(GKeyFile *config) /* fallback to root */ vte_info.dir = g_strdup("/");

- vc->image = utils_get_setting_string(config, "VTE", "image", ""); vc->shell = utils_get_setting_string(config, "VTE", "shell", shell); vc->font = utils_get_setting_string(config, "VTE", "font", GEANY_DEFAULT_FONT_EDITOR); vc->scroll_on_key = utils_get_setting_boolean(config, "VTE", "scroll_on_key", TRUE);

Modified: src/prefs.c 7 lines changed, 0 insertions(+), 7 deletions(-) =================================================================== @@ -770,9 +770,6 @@ static void prefs_init_dialog(void) widget = ui_lookup_widget(ui_widgets.prefs_dialog, "color_back"); gtk_color_button_set_color(GTK_COLOR_BUTTON(widget), &vc->colour_back);

- widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image"); - gtk_entry_set_text(GTK_ENTRY(widget), vc->image); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_scrollback"); gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), vc->scrollback_lines);

@@ -1241,10 +1238,6 @@ on_prefs_dialog_response(GtkDialog *dialog, gint response, gpointer user_data) gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); vc->scrollback_lines = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));

- widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image"); - g_free(vc->image); - vc->image = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget))); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell"); g_free(vc->shell); vc->shell = g_strdup(gtk_entry_get_text(GTK_ENTRY(widget)));

Modified: src/vte.c 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -132,7 +132,6 @@ struct VteFunctions void (*vte_terminal_set_cursor_blinks) (VteTerminal *terminal, gboolean blink); void (*vte_terminal_select_all) (VteTerminal *terminal); void (*vte_terminal_set_audible_bell) (VteTerminal *terminal, gboolean is_audible); - void (*vte_terminal_set_background_image_file) (VteTerminal *terminal, const char *path); GtkAdjustment* (*vte_terminal_get_adjustment) (VteTerminal *terminal); #if GTK_CHECK_VERSION(3, 0, 0) /* hack for the VTE 2.91 API using GdkRGBA: we wrap the API to keep using GdkColor on our side */ @@ -398,7 +397,6 @@ void vte_close(void) gtk_widget_destroy(vc->menu); g_object_unref(vc->menu); g_free(vc->shell); - g_free(vc->image); g_free(vc->font); g_free(vc->send_cmd_prefix); g_free(vc); @@ -624,7 +622,6 @@ static gboolean vte_register_symbols(GModule *mod) BIND_REQUIRED_SYMBOL(vte_terminal_set_color_bold); BIND_REQUIRED_SYMBOL(vte_terminal_set_color_background); } - BIND_REQUIRED_SYMBOL(vte_terminal_set_background_image_file); BIND_REQUIRED_SYMBOL(vte_terminal_feed_child); BIND_SYMBOL(vte_terminal_im_append_menuitems); if (! BIND_SYMBOL(vte_terminal_set_cursor_blink_mode)) @@ -663,7 +660,6 @@ void vte_apply_user_settings(void) vf->vte_terminal_set_color_foreground(VTE_TERMINAL(vc->vte), &vc->colour_fore); vf->vte_terminal_set_color_bold(VTE_TERMINAL(vc->vte), &vc->colour_fore); vf->vte_terminal_set_color_background(VTE_TERMINAL(vc->vte), &vc->colour_back); - vf->vte_terminal_set_background_image_file(VTE_TERMINAL(vc->vte), vc->image); vf->vte_terminal_set_audible_bell(VTE_TERMINAL(vc->vte), prefs.beep_on_errors); vte_set_cursor_blink_mode();

@@ -952,18 +948,12 @@ void vte_append_preferences_tab(void) GtkWidget *frame_term, *button_shell, *entry_shell; GtkWidget *check_run_in_vte, *check_skip_script; GtkWidget *font_button, *fg_color_button, *bg_color_button; - GtkWidget *entry_image, *button_image;

button_shell = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term_shell")); entry_shell = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell")); ui_setup_open_button_callback(button_shell, NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_ENTRY(entry_shell));

- button_image = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "button_term_image")); - entry_image = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_image")); - ui_setup_open_button_callback(button_image, NULL, - GTK_FILE_CHOOSER_ACTION_OPEN, GTK_ENTRY(entry_image)); - check_skip_script = GTK_WIDGET(ui_lookup_widget(ui_widgets.prefs_dialog, "check_skip_script")); gtk_widget_set_sensitive(check_skip_script, vc->run_in_vte);

Modified: src/vte.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -57,7 +57,6 @@ typedef struct gboolean send_selection_unsafe; gint scrollback_lines; gchar *shell; - gchar *image; gchar *font; gchar *send_cmd_prefix; GdkColor colour_fore;

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).