SF.net SVN: geany:[4967] branches/sm
statc at users.sourceforge.net
statc at xxxxx
Mon May 31 09:15:55 UTC 2010
Revision: 4967
http://geany.svn.sourceforge.net/geany/?rev=4967&view=rev
Author: statc
Date: 2010-05-31 09:15:54 +0000 (Mon, 31 May 2010)
Log Message:
-----------
Revert last two commits.
Modified Paths:
--------------
branches/sm/geany.glade
branches/sm/src/callbacks.c
branches/sm/src/callbacks.h
branches/sm/src/interface.c
branches/sm/src/keyfile.c
branches/sm/src/main.c
Modified: branches/sm/geany.glade
===================================================================
--- branches/sm/geany.glade 2010-05-30 23:30:53 UTC (rev 4966)
+++ branches/sm/geany.glade 2010-05-31 09:15:54 UTC (rev 4967)
@@ -67,7 +67,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3165">
+ <widget class="GtkImage" id="image3141">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -144,7 +144,7 @@
<signal name="activate" handler="on_save_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3166">
+ <widget class="GtkImage" id="image3142">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -165,7 +165,7 @@
<signal name="activate" handler="on_toolbutton_reload_clicked" last_modification_time="Mon, 01 Sep 2008 16:57:06 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3167">
+ <widget class="GtkImage" id="image3143">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@@ -185,7 +185,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3168">
+ <widget class="GtkImage" id="image3144">
<property name="visible">True</property>
<property name="stock">gtk-revert-to-saved</property>
<property name="icon_size">1</property>
@@ -272,7 +272,7 @@
<signal name="activate" handler="on_close_other_documents1_activate" last_modification_time="Fri, 27 Jun 2008 15:19:28 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3169">
+ <widget class="GtkImage" id="image3145">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -293,7 +293,7 @@
<signal name="activate" handler="on_close_all1_activate" last_modification_time="Thu, 02 Jun 2005 14:15:30 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3170">
+ <widget class="GtkImage" id="image3146">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -499,7 +499,7 @@
<signal name="activate" handler="on_menu_increase_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3171">
+ <widget class="GtkImage" id="image3147">
<property name="visible">True</property>
<property name="stock">gtk-indent</property>
<property name="icon_size">1</property>
@@ -520,7 +520,7 @@
<signal name="activate" handler="on_menu_decrease_indent1_activate" last_modification_time="Tue, 01 Aug 2006 10:28:54 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3172">
+ <widget class="GtkImage" id="image3148">
<property name="visible">True</property>
<property name="stock">gtk-unindent</property>
<property name="icon_size">1</property>
@@ -598,7 +598,7 @@
<signal name="activate" handler="on_cut_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3173">
+ <widget class="GtkImage" id="image3149">
<property name="visible">True</property>
<property name="stock">gtk-cut</property>
<property name="icon_size">1</property>
@@ -619,7 +619,7 @@
<signal name="activate" handler="on_copy_current_line(s)1_activate" last_modification_time="Mon, 26 Oct 2009 17:34:30 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3174">
+ <widget class="GtkImage" id="image3150">
<property name="visible">True</property>
<property name="stock">gtk-copy</property>
<property name="icon_size">1</property>
@@ -730,7 +730,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3175">
+ <widget class="GtkImage" id="image3151">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -809,7 +809,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3176">
+ <widget class="GtkImage" id="image3152">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -841,7 +841,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3177">
+ <widget class="GtkImage" id="image3153">
<property name="visible">True</property>
<property name="stock">gtk-add</property>
<property name="icon_size">1</property>
@@ -880,7 +880,7 @@
<signal name="activate" handler="on_preferences1_activate" last_modification_time="Wed, 08 Jun 2005 11:35:19 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3178">
+ <widget class="GtkImage" id="image3154">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -901,7 +901,7 @@
<signal name="activate" handler="on_plugin_preferences1_activate" last_modification_time="Wed, 28 Oct 2009 17:17:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3179">
+ <widget class="GtkImage" id="image3155">
<property name="visible">True</property>
<property name="stock">gtk-preferences</property>
<property name="icon_size">1</property>
@@ -972,7 +972,7 @@
<signal name="activate" handler="on_replace1_activate" last_modification_time="Sun, 23 Oct 2005 13:22:36 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3180">
+ <widget class="GtkImage" id="image3156">
<property name="visible">True</property>
<property name="stock">gtk-find-and-replace</property>
<property name="icon_size">1</property>
@@ -1047,7 +1047,7 @@
<signal name="activate" handler="on_go_to_line_activate" last_modification_time="Sat, 06 Dec 2008 17:41:21 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3181">
+ <widget class="GtkImage" id="image3157">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
@@ -1081,7 +1081,7 @@
<signal name="activate" handler="on_change_font1_activate" last_modification_time="Fri, 22 Apr 2005 18:58:45 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3182">
+ <widget class="GtkImage" id="image3158">
<property name="visible">True</property>
<property name="stock">gtk-select-font</property>
<property name="icon_size">1</property>
@@ -1553,7 +1553,7 @@
<signal name="activate" handler="on_project_new1_activate" last_modification_time="Thu, 18 Jan 2007 22:16:24 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3183">
+ <widget class="GtkImage" id="image3159">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -1574,7 +1574,7 @@
<signal name="activate" handler="on_project_open1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3184">
+ <widget class="GtkImage" id="image3160">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -1603,7 +1603,7 @@
<signal name="activate" handler="on_project_close1_activate" last_modification_time="Mon, 15 Jan 2007 17:34:17 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3185">
+ <widget class="GtkImage" id="image3161">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -1653,27 +1653,6 @@
<widget class="GtkMenu" id="tools1_menu">
<child>
- <widget class="GtkImageMenuItem" id="menu_save_configuration">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Save Configuration</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_menu_save_configuration_activate" last_modification_time="Wed, 19 May 2010 05:45:29 GMT"/>
-
- <child internal-child="image">
- <widget class="GtkImage" id="image3186">
- <property name="visible">True</property>
- <property name="stock">gtk-save</property>
- <property name="icon_size">1</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
<widget class="GtkImageMenuItem" id="menu_reload_configuration1">
<property name="visible">True</property>
<property name="label" translatable="yes">_Reload Configuration</property>
@@ -1681,7 +1660,7 @@
<signal name="activate" handler="on_menu_reload_configuration1_activate" last_modification_time="Mon, 30 Jun 2008 16:19:40 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3187">
+ <widget class="GtkImage" id="image3162">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -1701,7 +1680,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image3188">
+ <widget class="GtkImage" id="image3163">
<property name="visible">True</property>
<property name="stock">gtk-file</property>
<property name="icon_size">1</property>
@@ -1728,7 +1707,7 @@
<signal name="activate" handler="on_show_color_chooser1_activate" last_modification_time="Wed, 22 Jun 2005 18:10:21 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3189">
+ <widget class="GtkImage" id="image3164">
<property name="visible">True</property>
<property name="stock">gtk-select-color</property>
<property name="icon_size">1</property>
@@ -1780,7 +1759,7 @@
<signal name="activate" handler="on_help1_activate" last_modification_time="Sun, 24 Jul 2005 15:23:11 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image3190">
+ <widget class="GtkImage" id="image3165">
<property name="visible">True</property>
<property name="stock">gtk-help</property>
<property name="icon_size">1</property>
Modified: branches/sm/src/callbacks.c
===================================================================
--- branches/sm/src/callbacks.c 2010-05-30 23:30:53 UTC (rev 4966)
+++ branches/sm/src/callbacks.c 2010-05-31 09:15:54 UTC (rev 4967)
@@ -2349,10 +2349,3 @@
#endif
}
-
-void
-on_menu_save_configuration_activate (GtkMenuItem *menuitem,
- gpointer user_data)
-{
- configuration_save();
-}
Modified: branches/sm/src/callbacks.h
===================================================================
--- branches/sm/src/callbacks.h 2010-05-30 23:30:53 UTC (rev 4966)
+++ branches/sm/src/callbacks.h 2010-05-31 09:15:54 UTC (rev 4967)
@@ -664,7 +664,3 @@
void
on_plugin_preferences1_activate (GtkMenuItem *menuitem,
gpointer user_data);
-
-void
-on_menu_save_configuration_activate (GtkMenuItem *menuitem,
- gpointer user_data);
Modified: branches/sm/src/interface.c
===================================================================
--- branches/sm/src/interface.c 2010-05-30 23:30:53 UTC (rev 4966)
+++ branches/sm/src/interface.c 2010-05-31 09:15:54 UTC (rev 4967)
@@ -38,7 +38,7 @@
GtkWidget *file1_menu;
GtkWidget *menu_new1;
GtkWidget *menu_new_with_template1;
- GtkWidget *image3165;
+ GtkWidget *image3141;
GtkWidget *separator12;
GtkWidget *menu_open1;
GtkWidget *menu_open_selected_file1;
@@ -47,11 +47,11 @@
GtkWidget *menu_save1;
GtkWidget *menu_save_as1;
GtkWidget *menu_save_all1;
- GtkWidget *image3166;
+ GtkWidget *image3142;
GtkWidget *menu_reload1;
- GtkWidget *image3167;
+ GtkWidget *image3143;
GtkWidget *menu_reload_as1;
- GtkWidget *image3168;
+ GtkWidget *image3144;
GtkWidget *menu_reload_as1_menu;
GtkWidget *invisible7;
GtkWidget *separator21;
@@ -62,9 +62,9 @@
GtkWidget *separator14;
GtkWidget *menu_close1;
GtkWidget *close_other_documents1;
- GtkWidget *image3169;
+ GtkWidget *image3145;
GtkWidget *menu_close_all1;
- GtkWidget *image3170;
+ GtkWidget *image3146;
GtkWidget *menu_separatormenuitem1;
GtkWidget *menu_quit1;
GtkWidget *edit1;
@@ -90,9 +90,9 @@
GtkWidget *menu_toggle_line_commentation1;
GtkWidget *separator29;
GtkWidget *menu_increase_indent1;
- GtkWidget *image3171;
+ GtkWidget *image3147;
GtkWidget *menu_decrease_indent1;
- GtkWidget *image3172;
+ GtkWidget *image3148;
GtkWidget *smart_line_indent1;
GtkWidget *separator37;
GtkWidget *send_selection_to_vte1;
@@ -102,9 +102,9 @@
GtkWidget *commands2;
GtkWidget *commands2_menu;
GtkWidget *cut_current_line_s_1;
- GtkWidget *image3173;
+ GtkWidget *image3149;
GtkWidget *copy_current_line_s_1;
- GtkWidget *image3174;
+ GtkWidget *image3150;
GtkWidget *delete_current_line_s_1;
GtkWidget *duplicate_line_or_selection1;
GtkWidget *separator49;
@@ -117,7 +117,7 @@
GtkWidget *go_to_previous_marker1;
GtkWidget *separator18;
GtkWidget *add_comments1;
- GtkWidget *image3175;
+ GtkWidget *image3151;
GtkWidget *add_comments1_menu;
GtkWidget *menu_add_changelog_entry1;
GtkWidget *insert_file_header1;
@@ -126,18 +126,18 @@
GtkWidget *insert_gpl_notice2;
GtkWidget *insert_bsd_license_notice2;
GtkWidget *insert_date1;
- GtkWidget *image3176;
+ GtkWidget *image3152;
GtkWidget *insert_date1_menu;
GtkWidget *invisible8;
GtkWidget *insert_include2;
- GtkWidget *image3177;
+ GtkWidget *image3153;
GtkWidget *insert_include2_menu;
GtkWidget *invisible4;
GtkWidget *separator9;
GtkWidget *preferences1;
- GtkWidget *image3178;
+ GtkWidget *image3154;
GtkWidget *plugin_preferences1;
- GtkWidget *image3179;
+ GtkWidget *image3155;
GtkWidget *search1;
GtkWidget *search1_menu;
GtkWidget *find1;
@@ -145,7 +145,7 @@
GtkWidget *find_previous1;
GtkWidget *find_in_files1;
GtkWidget *replace1;
- GtkWidget *image3180;
+ GtkWidget *image3156;
GtkWidget *separator33;
GtkWidget *find_nextsel1;
GtkWidget *find_prevsel1;
@@ -154,11 +154,11 @@
GtkWidget *previous_message1;
GtkWidget *separator32;
GtkWidget *go_to_line1;
- GtkWidget *image3181;
+ GtkWidget *image3157;
GtkWidget *menu_view1;
GtkWidget *menu_view1_menu;
GtkWidget *menu_change_font1;
- GtkWidget *image3182;
+ GtkWidget *image3158;
GtkWidget *menu_separator4;
GtkWidget *menu_toggle_all_additional_widgets1;
GtkWidget *menu_fullscreen1;
@@ -216,32 +216,30 @@
GtkWidget *menu_project1;
GtkWidget *menu_project1_menu;
GtkWidget *project_new1;
- GtkWidget *image3183;
+ GtkWidget *image3159;
GtkWidget *project_open1;
- GtkWidget *image3184;
+ GtkWidget *image3160;
GtkWidget *recent_projects1;
GtkWidget *project_close1;
- GtkWidget *image3185;
+ GtkWidget *image3161;
GtkWidget *separator34;
GtkWidget *project_properties1;
GtkWidget *menu_build1;
GtkWidget *tools1;
GtkWidget *tools1_menu;
- GtkWidget *menu_save_configuration;
- GtkWidget *image3186;
GtkWidget *menu_reload_configuration1;
- GtkWidget *image3187;
+ GtkWidget *image3162;
GtkWidget *configuration_files1;
- GtkWidget *image3188;
+ GtkWidget *image3163;
GtkWidget *separator47;
GtkWidget *menu_choose_color1;
- GtkWidget *image3189;
+ GtkWidget *image3164;
GtkWidget *menu_count_words1;
GtkWidget *load_tags1;
GtkWidget *menu_help1;
GtkWidget *menu_help1_menu;
GtkWidget *help1;
- GtkWidget *image3190;
+ GtkWidget *image3165;
GtkWidget *website1;
GtkWidget *keyboard_shortcuts1;
GtkWidget *debug_messages1;
@@ -308,9 +306,9 @@
gtk_widget_show (menu_new_with_template1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_new_with_template1);
- image3165 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3165);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3165);
+ image3141 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3141);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_new_with_template1), image3141);
separator12 = gtk_separator_menu_item_new ();
gtk_widget_show (separator12);
@@ -346,25 +344,25 @@
gtk_widget_show (menu_save_all1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_save_all1);
- image3166 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3166);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3166);
+ image3142 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3142);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_all1), image3142);
menu_reload1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload"));
gtk_widget_show (menu_reload1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload1);
- image3167 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3167);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3167);
+ image3143 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3143);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload1), image3143);
menu_reload_as1 = gtk_image_menu_item_new_with_mnemonic (_("R_eload As"));
gtk_widget_show (menu_reload_as1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_reload_as1);
- image3168 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3168);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3168);
+ image3144 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3144);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_as1), image3144);
menu_reload_as1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_reload_as1), menu_reload_as1_menu);
@@ -407,17 +405,17 @@
gtk_widget_show (close_other_documents1);
gtk_container_add (GTK_CONTAINER (file1_menu), close_other_documents1);
- image3169 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3169);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3169);
+ image3145 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3145);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (close_other_documents1), image3145);
menu_close_all1 = gtk_image_menu_item_new_with_mnemonic (_("C_lose All"));
gtk_widget_show (menu_close_all1);
gtk_container_add (GTK_CONTAINER (file1_menu), menu_close_all1);
- image3170 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3170);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3170);
+ image3146 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3146);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_close_all1), image3146);
menu_separatormenuitem1 = gtk_separator_menu_item_new ();
gtk_widget_show (menu_separatormenuitem1);
@@ -523,17 +521,17 @@
gtk_widget_show (menu_increase_indent1);
gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_increase_indent1);
- image3171 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3171);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3171);
+ image3147 = gtk_image_new_from_stock ("gtk-indent", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3147);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_increase_indent1), image3147);
menu_decrease_indent1 = gtk_image_menu_item_new_with_mnemonic (_("_Decrease Indent"));
gtk_widget_show (menu_decrease_indent1);
gtk_container_add (GTK_CONTAINER (menu_format1_menu), menu_decrease_indent1);
- image3172 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3172);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3172);
+ image3148 = gtk_image_new_from_stock ("gtk-unindent", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3148);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_decrease_indent1), image3148);
smart_line_indent1 = gtk_menu_item_new_with_mnemonic (_("_Smart Line Indent"));
gtk_widget_show (smart_line_indent1);
@@ -569,17 +567,17 @@
gtk_widget_show (cut_current_line_s_1);
gtk_container_add (GTK_CONTAINER (commands2_menu), cut_current_line_s_1);
- image3173 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3173);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3173);
+ image3149 = gtk_image_new_from_stock ("gtk-cut", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3149);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (cut_current_line_s_1), image3149);
copy_current_line_s_1 = gtk_image_menu_item_new_with_mnemonic (_("Copy current line(s)"));
gtk_widget_show (copy_current_line_s_1);
gtk_container_add (GTK_CONTAINER (commands2_menu), copy_current_line_s_1);
- image3174 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3174);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3174);
+ image3150 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3150);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_current_line_s_1), image3150);
delete_current_line_s_1 = gtk_menu_item_new_with_mnemonic (_("Delete current line(s)"));
gtk_widget_show (delete_current_line_s_1);
@@ -633,9 +631,9 @@
gtk_widget_show (add_comments1);
gtk_container_add (GTK_CONTAINER (edit1_menu), add_comments1);
- image3175 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3175);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3175);
+ image3151 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3151);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_comments1), image3151);
add_comments1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (add_comments1), add_comments1_menu);
@@ -668,9 +666,9 @@
gtk_widget_show (insert_date1);
gtk_container_add (GTK_CONTAINER (edit1_menu), insert_date1);
- image3176 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3176);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3176);
+ image3152 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3152);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_date1), image3152);
insert_date1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_date1), insert_date1_menu);
@@ -682,9 +680,9 @@
gtk_widget_show (insert_include2);
gtk_container_add (GTK_CONTAINER (edit1_menu), insert_include2);
- image3177 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3177);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3177);
+ image3153 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3153);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (insert_include2), image3153);
insert_include2_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (insert_include2), insert_include2_menu);
@@ -701,17 +699,17 @@
gtk_widget_show (preferences1);
gtk_container_add (GTK_CONTAINER (edit1_menu), preferences1);
- image3178 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3178);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3178);
+ image3154 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3154);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (preferences1), image3154);
plugin_preferences1 = gtk_image_menu_item_new_with_mnemonic (_("P_lugin Preferences"));
gtk_widget_show (plugin_preferences1);
gtk_container_add (GTK_CONTAINER (edit1_menu), plugin_preferences1);
- image3179 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3179);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3179);
+ image3155 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3155);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (plugin_preferences1), image3155);
search1 = gtk_menu_item_new_with_mnemonic (_("_Search"));
gtk_widget_show (search1);
@@ -740,9 +738,9 @@
gtk_widget_show (replace1);
gtk_container_add (GTK_CONTAINER (search1_menu), replace1);
- image3180 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3180);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3180);
+ image3156 = gtk_image_new_from_stock ("gtk-find-and-replace", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3156);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (replace1), image3156);
separator33 = gtk_separator_menu_item_new ();
gtk_widget_show (separator33);
@@ -779,9 +777,9 @@
gtk_widget_show (go_to_line1);
gtk_container_add (GTK_CONTAINER (search1_menu), go_to_line1);
- image3181 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3181);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3181);
+ image3157 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3157);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (go_to_line1), image3157);
menu_view1 = gtk_menu_item_new_with_mnemonic (_("_View"));
gtk_widget_show (menu_view1);
@@ -794,9 +792,9 @@
gtk_widget_show (menu_change_font1);
gtk_container_add (GTK_CONTAINER (menu_view1_menu), menu_change_font1);
- image3182 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3182);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3182);
+ image3158 = gtk_image_new_from_stock ("gtk-select-font", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3158);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_change_font1), image3158);
menu_separator4 = gtk_separator_menu_item_new ();
gtk_widget_show (menu_separator4);
@@ -1035,17 +1033,17 @@
gtk_widget_show (project_new1);
gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_new1);
- image3183 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3183);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3183);
+ image3159 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3159);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_new1), image3159);
project_open1 = gtk_image_menu_item_new_with_mnemonic (_("_Open"));
gtk_widget_show (project_open1);
gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_open1);
- image3184 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3184);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3184);
+ image3160 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3160);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_open1), image3160);
recent_projects1 = gtk_menu_item_new_with_mnemonic (_("_Recent Projects"));
gtk_widget_show (recent_projects1);
@@ -1055,9 +1053,9 @@
gtk_widget_show (project_close1);
gtk_container_add (GTK_CONTAINER (menu_project1_menu), project_close1);
- image3185 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3185);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3185);
+ image3161 = gtk_image_new_from_stock ("gtk-close", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3161);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (project_close1), image3161);
separator34 = gtk_separator_menu_item_new ();
gtk_widget_show (separator34);
@@ -1079,29 +1077,21 @@
tools1_menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (tools1), tools1_menu);
- menu_save_configuration = gtk_image_menu_item_new_with_mnemonic (_("_Save Configuration"));
- gtk_widget_show (menu_save_configuration);
- gtk_container_add (GTK_CONTAINER (tools1_menu), menu_save_configuration);
-
- image3186 = gtk_image_new_from_stock ("gtk-save", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3186);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_configuration), image3186);
-
menu_reload_configuration1 = gtk_image_menu_item_new_with_mnemonic (_("_Reload Configuration"));
gtk_widget_show (menu_reload_configuration1);
gtk_container_add (GTK_CONTAINER (tools1_menu), menu_reload_configuration1);
- image3187 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3187);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3187);
+ image3162 = gtk_image_new_from_stock ("gtk-refresh", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3162);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reload_configuration1), image3162);
configuration_files1 = gtk_image_menu_item_new_with_mnemonic (_("C_onfiguration Files"));
gtk_widget_show (configuration_files1);
gtk_container_add (GTK_CONTAINER (tools1_menu), configuration_files1);
- image3188 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3188);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3188);
+ image3163 = gtk_image_new_from_stock ("gtk-file", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3163);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (configuration_files1), image3163);
separator47 = gtk_separator_menu_item_new ();
gtk_widget_show (separator47);
@@ -1112,9 +1102,9 @@
gtk_widget_show (menu_choose_color1);
gtk_container_add (GTK_CONTAINER (tools1_menu), menu_choose_color1);
- image3189 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3189);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3189);
+ image3164 = gtk_image_new_from_stock ("gtk-select-color", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3164);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_choose_color1), image3164);
menu_count_words1 = gtk_menu_item_new_with_mnemonic (_("_Word Count"));
gtk_widget_show (menu_count_words1);
@@ -1135,9 +1125,9 @@
gtk_widget_show (help1);
gtk_container_add (GTK_CONTAINER (menu_help1_menu), help1);
- image3190 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
- gtk_widget_show (image3190);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3190);
+ image3165 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+ gtk_widget_show (image3165);
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (help1), image3165);
website1 = gtk_menu_item_new_with_mnemonic (_("_Website"));
gtk_widget_show (website1);
@@ -1584,9 +1574,6 @@
g_signal_connect ((gpointer) project_properties1, "activate",
G_CALLBACK (on_project_properties1_activate),
NULL);
- g_signal_connect ((gpointer) menu_save_configuration, "activate",
- G_CALLBACK (on_menu_save_configuration_activate),
- NULL);
g_signal_connect ((gpointer) menu_reload_configuration1, "activate",
G_CALLBACK (on_menu_reload_configuration1_activate),
NULL);
@@ -1640,7 +1627,7 @@
GLADE_HOOKUP_OBJECT (window1, file1_menu, "file1_menu");
GLADE_HOOKUP_OBJECT (window1, menu_new1, "menu_new1");
GLADE_HOOKUP_OBJECT (window1, menu_new_with_template1, "menu_new_with_template1");
- GLADE_HOOKUP_OBJECT (window1, image3165, "image3165");
+ GLADE_HOOKUP_OBJECT (window1, image3141, "image3141");
GLADE_HOOKUP_OBJECT (window1, separator12, "separator12");
GLADE_HOOKUP_OBJECT (window1, menu_open1, "menu_open1");
GLADE_HOOKUP_OBJECT (window1, menu_open_selected_file1, "menu_open_selected_file1");
@@ -1649,11 +1636,11 @@
GLADE_HOOKUP_OBJECT (window1, menu_save1, "menu_save1");
GLADE_HOOKUP_OBJECT (window1, menu_save_as1, "menu_save_as1");
GLADE_HOOKUP_OBJECT (window1, menu_save_all1, "menu_save_all1");
- GLADE_HOOKUP_OBJECT (window1, image3166, "image3166");
+ GLADE_HOOKUP_OBJECT (window1, image3142, "image3142");
GLADE_HOOKUP_OBJECT (window1, menu_reload1, "menu_reload1");
- GLADE_HOOKUP_OBJECT (window1, image3167, "image3167");
+ GLADE_HOOKUP_OBJECT (window1, image3143, "image3143");
GLADE_HOOKUP_OBJECT (window1, menu_reload_as1, "menu_reload_as1");
- GLADE_HOOKUP_OBJECT (window1, image3168, "image3168");
+ GLADE_HOOKUP_OBJECT (window1, image3144, "image3144");
GLADE_HOOKUP_OBJECT (window1, menu_reload_as1_menu, "menu_reload_as1_menu");
GLADE_HOOKUP_OBJECT (window1, invisible7, "invisible7");
GLADE_HOOKUP_OBJECT (window1, separator21, "separator21");
@@ -1664,9 +1651,9 @@
GLADE_HOOKUP_OBJECT (window1, separator14, "separator14");
GLADE_HOOKUP_OBJECT (window1, menu_close1, "menu_close1");
GLADE_HOOKUP_OBJECT (window1, close_other_documents1, "close_other_documents1");
- GLADE_HOOKUP_OBJECT (window1, image3169, "image3169");
+ GLADE_HOOKUP_OBJECT (window1, image3145, "image3145");
GLADE_HOOKUP_OBJECT (window1, menu_close_all1, "menu_close_all1");
- GLADE_HOOKUP_OBJECT (window1, image3170, "image3170");
+ GLADE_HOOKUP_OBJECT (window1, image3146, "image3146");
GLADE_HOOKUP_OBJECT (window1, menu_separatormenuitem1, "menu_separatormenuitem1");
GLADE_HOOKUP_OBJECT (window1, menu_quit1, "menu_quit1");
GLADE_HOOKUP_OBJECT (window1, edit1, "edit1");
@@ -1692,9 +1679,9 @@
GLADE_HOOKUP_OBJECT (window1, menu_toggle_line_commentation1, "menu_toggle_line_commentation1");
GLADE_HOOKUP_OBJECT (window1, separator29, "separator29");
GLADE_HOOKUP_OBJECT (window1, menu_increase_indent1, "menu_increase_indent1");
- GLADE_HOOKUP_OBJECT (window1, image3171, "image3171");
+ GLADE_HOOKUP_OBJECT (window1, image3147, "image3147");
GLADE_HOOKUP_OBJECT (window1, menu_decrease_indent1, "menu_decrease_indent1");
- GLADE_HOOKUP_OBJECT (window1, image3172, "image3172");
+ GLADE_HOOKUP_OBJECT (window1, image3148, "image3148");
GLADE_HOOKUP_OBJECT (window1, smart_line_indent1, "smart_line_indent1");
GLADE_HOOKUP_OBJECT (window1, separator37, "separator37");
GLADE_HOOKUP_OBJECT (window1, send_selection_to_vte1, "send_selection_to_vte1");
@@ -1704,9 +1691,9 @@
GLADE_HOOKUP_OBJECT (window1, commands2, "commands2");
GLADE_HOOKUP_OBJECT (window1, commands2_menu, "commands2_menu");
GLADE_HOOKUP_OBJECT (window1, cut_current_line_s_1, "cut_current_line_s_1");
- GLADE_HOOKUP_OBJECT (window1, image3173, "image3173");
+ GLADE_HOOKUP_OBJECT (window1, image3149, "image3149");
GLADE_HOOKUP_OBJECT (window1, copy_current_line_s_1, "copy_current_line_s_1");
- GLADE_HOOKUP_OBJECT (window1, image3174, "image3174");
+ GLADE_HOOKUP_OBJECT (window1, image3150, "image3150");
GLADE_HOOKUP_OBJECT (window1, delete_current_line_s_1, "delete_current_line_s_1");
GLADE_HOOKUP_OBJECT (window1, duplicate_line_or_selection1, "duplicate_line_or_selection1");
GLADE_HOOKUP_OBJECT (window1, separator49, "separator49");
@@ -1719,7 +1706,7 @@
GLADE_HOOKUP_OBJECT (window1, go_to_previous_marker1, "go_to_previous_marker1");
GLADE_HOOKUP_OBJECT (window1, separator18, "separator18");
GLADE_HOOKUP_OBJECT (window1, add_comments1, "add_comments1");
- GLADE_HOOKUP_OBJECT (window1, image3175, "image3175");
+ GLADE_HOOKUP_OBJECT (window1, image3151, "image3151");
GLADE_HOOKUP_OBJECT (window1, add_comments1_menu, "add_comments1_menu");
GLADE_HOOKUP_OBJECT (window1, menu_add_changelog_entry1, "menu_add_changelog_entry1");
GLADE_HOOKUP_OBJECT (window1, insert_file_header1, "insert_file_header1");
@@ -1728,18 +1715,18 @@
GLADE_HOOKUP_OBJECT (window1, insert_gpl_notice2, "insert_gpl_notice2");
GLADE_HOOKUP_OBJECT (window1, insert_bsd_license_notice2, "insert_bsd_license_notice2");
GLADE_HOOKUP_OBJECT (window1, insert_date1, "insert_date1");
- GLADE_HOOKUP_OBJECT (window1, image3176, "image3176");
+ GLADE_HOOKUP_OBJECT (window1, image3152, "image3152");
GLADE_HOOKUP_OBJECT (window1, insert_date1_menu, "insert_date1_menu");
GLADE_HOOKUP_OBJECT (window1, invisible8, "invisible8");
GLADE_HOOKUP_OBJECT (window1, insert_include2, "insert_include2");
- GLADE_HOOKUP_OBJECT (window1, image3177, "image3177");
+ GLADE_HOOKUP_OBJECT (window1, image3153, "image3153");
GLADE_HOOKUP_OBJECT (window1, insert_include2_menu, "insert_include2_menu");
GLADE_HOOKUP_OBJECT (window1, invisible4, "invisible4");
GLADE_HOOKUP_OBJECT (window1, separator9, "separator9");
GLADE_HOOKUP_OBJECT (window1, preferences1, "preferences1");
- GLADE_HOOKUP_OBJECT (window1, image3178, "image3178");
+ GLADE_HOOKUP_OBJECT (window1, image3154, "image3154");
GLADE_HOOKUP_OBJECT (window1, plugin_preferences1, "plugin_preferences1");
- GLADE_HOOKUP_OBJECT (window1, image3179, "image3179");
+ GLADE_HOOKUP_OBJECT (window1, image3155, "image3155");
GLADE_HOOKUP_OBJECT (window1, search1, "search1");
GLADE_HOOKUP_OBJECT (window1, search1_menu, "search1_menu");
GLADE_HOOKUP_OBJECT (window1, find1, "find1");
@@ -1747,7 +1734,7 @@
GLADE_HOOKUP_OBJECT (window1, find_previous1, "find_previous1");
GLADE_HOOKUP_OBJECT (window1, find_in_files1, "find_in_files1");
GLADE_HOOKUP_OBJECT (window1, replace1, "replace1");
- GLADE_HOOKUP_OBJECT (window1, image3180, "image3180");
+ GLADE_HOOKUP_OBJECT (window1, image3156, "image3156");
GLADE_HOOKUP_OBJECT (window1, separator33, "separator33");
GLADE_HOOKUP_OBJECT (window1, find_nextsel1, "find_nextsel1");
GLADE_HOOKUP_OBJECT (window1, find_prevsel1, "find_prevsel1");
@@ -1756,11 +1743,11 @@
GLADE_HOOKUP_OBJECT (window1, previous_message1, "previous_message1");
GLADE_HOOKUP_OBJECT (window1, separator32, "separator32");
GLADE_HOOKUP_OBJECT (window1, go_to_line1, "go_to_line1");
- GLADE_HOOKUP_OBJECT (window1, image3181, "image3181");
+ GLADE_HOOKUP_OBJECT (window1, image3157, "image3157");
GLADE_HOOKUP_OBJECT (window1, menu_view1, "menu_view1");
GLADE_HOOKUP_OBJECT (window1, menu_view1_menu, "menu_view1_menu");
GLADE_HOOKUP_OBJECT (window1, menu_change_font1, "menu_change_font1");
- GLADE_HOOKUP_OBJECT (window1, image3182, "image3182");
+ GLADE_HOOKUP_OBJECT (window1, image3158, "image3158");
GLADE_HOOKUP_OBJECT (window1, menu_separator4, "menu_separator4");
GLADE_HOOKUP_OBJECT (window1, menu_toggle_all_additional_widgets1, "menu_toggle_all_additional_widgets1");
GLADE_HOOKUP_OBJECT (window1, menu_fullscreen1, "menu_fullscreen1");
@@ -1816,32 +1803,30 @@
GLADE_HOOKUP_OBJECT (window1, menu_project1, "menu_project1");
GLADE_HOOKUP_OBJECT (window1, menu_project1_menu, "menu_project1_menu");
GLADE_HOOKUP_OBJECT (window1, project_new1, "project_new1");
- GLADE_HOOKUP_OBJECT (window1, image3183, "image3183");
+ GLADE_HOOKUP_OBJECT (window1, image3159, "image3159");
GLADE_HOOKUP_OBJECT (window1, project_open1, "project_open1");
- GLADE_HOOKUP_OBJECT (window1, image3184, "image3184");
+ GLADE_HOOKUP_OBJECT (window1, image3160, "image3160");
GLADE_HOOKUP_OBJECT (window1, recent_projects1, "recent_projects1");
GLADE_HOOKUP_OBJECT (window1, project_close1, "project_close1");
- GLADE_HOOKUP_OBJECT (window1, image3185, "image3185");
+ GLADE_HOOKUP_OBJECT (window1, image3161, "image3161");
GLADE_HOOKUP_OBJECT (window1, separator34, "separator34");
GLADE_HOOKUP_OBJECT (window1, project_properties1, "project_properties1");
GLADE_HOOKUP_OBJECT (window1, menu_build1, "menu_build1");
GLADE_HOOKUP_OBJECT (window1, tools1, "tools1");
GLADE_HOOKUP_OBJECT (window1, tools1_menu, "tools1_menu");
- GLADE_HOOKUP_OBJECT (window1, menu_save_configuration, "menu_save_configuration");
- GLADE_HOOKUP_OBJECT (window1, image3186, "image3186");
GLADE_HOOKUP_OBJECT (window1, menu_reload_configuration1, "menu_reload_configuration1");
- GLADE_HOOKUP_OBJECT (window1, image3187, "image3187");
+ GLADE_HOOKUP_OBJECT (window1, image3162, "image3162");
GLADE_HOOKUP_OBJECT (window1, configuration_files1, "configuration_files1");
- GLADE_HOOKUP_OBJECT (window1, image3188, "image3188");
+ GLADE_HOOKUP_OBJECT (window1, image3163, "image3163");
GLADE_HOOKUP_OBJECT (window1, separator47, "separator47");
GLADE_HOOKUP_OBJECT (window1, menu_choose_color1, "menu_choose_color1");
- GLADE_HOOKUP_OBJECT (window1, image3189, "image3189");
+ GLADE_HOOKUP_OBJECT (window1, image3164, "image3164");
GLADE_HOOKUP_OBJECT (window1, menu_count_words1, "menu_count_words1");
GLADE_HOOKUP_OBJECT (window1, load_tags1, "load_tags1");
GLADE_HOOKUP_OBJECT (window1, menu_help1, "menu_help1");
GLADE_HOOKUP_OBJECT (window1, menu_help1_menu, "menu_help1_menu");
GLADE_HOOKUP_OBJECT (window1, help1, "help1");
- GLADE_HOOKUP_OBJECT (window1, image3190, "image3190");
+ GLADE_HOOKUP_OBJECT (window1, image3165, "image3165");
GLADE_HOOKUP_OBJECT (window1, website1, "website1");
GLADE_HOOKUP_OBJECT (window1, keyboard_shortcuts1, "keyboard_shortcuts1");
GLADE_HOOKUP_OBJECT (window1, debug_messages1, "debug_messages1");
Modified: branches/sm/src/keyfile.c
===================================================================
--- branches/sm/src/keyfile.c 2010-05-30 23:30:53 UTC (rev 4966)
+++ branches/sm/src/keyfile.c 2010-05-31 09:15:54 UTC (rev 4967)
@@ -518,16 +518,10 @@
void configuration_save(void)
{
- GKeyFile *config;
- gchar *configfile;
+ GKeyFile *config = g_key_file_new();
+ gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL);
gchar *data;
- if (cl_options.new_instance)
- return;
-
- config = g_key_file_new();
- configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL);
-
g_key_file_load_from_file(config, configfile, G_KEY_FILE_NONE, NULL);
/* this signal can be used e.g. to prepare any settings before Stash code reads them below */
Modified: branches/sm/src/main.c
===================================================================
--- branches/sm/src/main.c 2010-05-30 23:30:53 UTC (rev 4966)
+++ branches/sm/src/main.c 2010-05-31 09:15:54 UTC (rev 4967)
@@ -1073,12 +1073,6 @@
ui_set_statusbar(TRUE, _("Configuration directory could not be created (%s)."),
g_strerror(config_dir_result));
- /* Allow to "Save Configuration" in main instance only */
- if (cl_options.new_instance)
- gtk_widget_set_sensitive(
- ui_lookup_widget(main_widgets.tools_menu, "menu_save_configuration"),
- FALSE);
-
/* apply all configuration options */
apply_settings();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list