Revision: 2898 http://geany.svn.sourceforge.net/geany/?rev=2898&view=rev Author: ntrel Date: 2008-08-19 11:20:09 +0000 (Tue, 19 Aug 2008)
Log Message: ----------- Don't disable 'Detect from file' indent type pref when 'Tabs and Spaces' is selected.
Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/interface.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-08-19 11:15:15 UTC (rev 2897) +++ trunk/ChangeLog 2008-08-19 11:20:09 UTC (rev 2898) @@ -3,6 +3,9 @@ * src/editor.c: Fix not using auto-completion in strings and comments (patch by Jason Oster, thanks; fixes #2057979). + * src/interface.c, src/callbacks.c, src/callbacks.h, geany.glade: + Don't disable 'Detect from file' indent type pref when 'Tabs and + Spaces' is selected.
2008-08-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2008-08-19 11:15:15 UTC (rev 2897) +++ trunk/geany.glade 2008-08-19 11:20:09 UTC (rev 2898) @@ -5570,7 +5570,6 @@ <property name="inconsistent">False</property> <property name="draw_indicator">True</property> <property name="group">radio_indent_spaces</property> - <signal name="toggled" handler="on_radio_indent_both_toggled" last_modification_time="Tue, 05 Aug 2008 15:14:37 GMT"/> </widget> <packing> <property name="left_attach">1</property>
Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-08-19 11:15:15 UTC (rev 2897) +++ trunk/src/callbacks.c 2008-08-19 11:20:09 UTC (rev 2898) @@ -2203,21 +2203,10 @@
void -on_radio_indent_both_toggled (GtkToggleButton *togglebutton, - gpointer user_data) -{ - GtkWidget *check = lookup_widget(ui_widgets.prefs_dialog, "check_detect_indent"); - gboolean active; - - active = gtk_toggle_button_get_active(togglebutton); - gtk_widget_set_sensitive(check, !active); -} - - -void on_debug_messages1_activate (GtkMenuItem *menuitem, gpointer user_data) { log_show_debug_messages_dialog(); }
+
Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2008-08-19 11:15:15 UTC (rev 2897) +++ trunk/src/callbacks.h 2008-08-19 11:20:09 UTC (rev 2898) @@ -630,11 +630,6 @@ void on_tabs_and_spaces1_activate (GtkMenuItem *menuitem, gpointer user_data); - void -on_radio_indent_both_toggled (GtkToggleButton *togglebutton, - gpointer user_data); - -void on_debug_messages1_activate (GtkMenuItem *menuitem, gpointer user_data);
Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2008-08-19 11:15:15 UTC (rev 2897) +++ trunk/src/interface.c 2008-08-19 11:20:09 UTC (rev 2898) @@ -4823,10 +4823,6 @@ gtk_dialog_add_action_widget (GTK_DIALOG (prefs_dialog), button5, GTK_RESPONSE_OK); GTK_WIDGET_SET_FLAGS (button5, GTK_CAN_DEFAULT);
- g_signal_connect ((gpointer) radio_indent_both, "toggled", - G_CALLBACK (on_radio_indent_both_toggled), - NULL); - /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, prefs_dialog, "prefs_dialog"); GLADE_HOOKUP_OBJECT_NO_REF (prefs_dialog, dialog_vbox3, "dialog_vbox3");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.