anjuta r4757 - in trunk: . plugins/file-loader plugins/file-manager

[jhs svn gnome org]

Author: jhs
Date: Mon Feb 16 20:35:19 2009
New Revision: 4757
URL: http://svn.gnome.org/viewvc/anjuta?rev=4757&view=rev

Log:
2009-02-16  Carl-Anton Ingmarsson  <ca ingmarsson gmail com>

	reviewed by: Johannes Schmid <jhs gnome org>

	* plugins/file-loader/plugin.c (on_new_clicked), (on_open_clicked),
	(activate_plugin):
	#570820 â problem with gtk+ trunk

Modified:
   trunk/ChangeLog
   trunk/plugins/file-loader/plugin.c
   trunk/plugins/file-manager/file-model.c

Modified: trunk/plugins/file-loader/plugin.c
==============================================================================
--- trunk/plugins/file-loader/plugin.c	(original)
+++ trunk/plugins/file-loader/plugin.c	Mon Feb 16 20:35:19 2009
@@ -575,6 +575,28 @@
 }
 
 static void
+on_new_clicked (GtkToolButton *button, AnjutaFileLoaderPlugin *plugin)
+{
+	AnjutaShell* shell = ANJUTA_PLUGIN (plugin)->shell;
+	IAnjutaDocumentManager *docman = anjuta_shell_get_interface (shell, 
+																 IAnjutaDocumentManager,
+																 NULL);
+	if (docman)
+		ianjuta_document_manager_add_buffer (docman, NULL, NULL, NULL);
+}
+
+static void
+on_open_clicked (GtkToolButton *button, AnjutaFileLoaderPlugin *plugin)
+{
+	GtkWidget *dlg;
+	
+	dlg =
+		create_file_open_dialog_gui (GTK_WINDOW (ANJUTA_PLUGIN(plugin)->shell),
+									 plugin);
+	gtk_widget_show (dlg);
+}
+
+static void
 on_new_activate (GtkAction *action, AnjutaFileLoaderPlugin *plugin)
 {
 	AnjutaShell* shell = ANJUTA_PLUGIN (plugin)->shell;
@@ -1192,7 +1214,6 @@
 	saction = gtk_recent_action_new ("ActionFileWizard", _("New"),
 							  _("New file, project and project components."), NULL);
 	g_object_set (saction, "stock-id", GTK_STOCK_NEW, NULL);
-	g_signal_connect (saction, "activate", G_CALLBACK (on_new_activate), loader_plugin);
 	gtk_action_group_add_action (loader_plugin->action_group,
 								 GTK_ACTION (saction));
 	
@@ -1206,7 +1227,6 @@
 												_("Open recent file"), NULL);
 	g_object_set (action, "stock-id", GTK_STOCK_OPEN, NULL);
 	setup_recent_chooser_menu (GTK_RECENT_CHOOSER (action), loader_plugin);
-	g_signal_connect (action, "activate", G_CALLBACK (on_open_activate), loader_plugin);
 	
 	gtk_action_group_add_action (group, action);
 	anjuta_ui_add_action_group (ui, "ActionGroupLoaderRecent",
@@ -1231,6 +1251,7 @@
 	widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER(ui),
 					"/ToolbarMain/PlaceholderFileToolbar/New");
 	gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (widget), on_create_submenu(loader_plugin));
+	g_signal_connect (widget, "clicked", G_CALLBACK (on_new_clicked), loader_plugin);
 	
 	widget = gtk_ui_manager_get_widget (GTK_UI_MANAGER(ui),
 					"/ToolbarMain/PlaceholderFileToolbar/Open");
@@ -1241,6 +1262,7 @@
 	gtk_tool_button_set_label (GTK_TOOL_BUTTON (widget), _("Open"));
 	gtk_tool_item_set_tooltip_text (GTK_TOOL_ITEM (widget), _("Open a file"));
 	gtk_menu_tool_button_set_arrow_tooltip_text (GTK_MENU_TOOL_BUTTON (widget), _("Open recent file"));
+	g_signal_connect (widget, "clicked", G_CALLBACK (on_open_clicked), loader_plugin);
 
 	/* Install drag n drop handler */
 	dnd_drop_init (GTK_WIDGET (plugin->shell), dnd_dropped, plugin,

Modified: trunk/plugins/file-manager/file-model.c
==============================================================================
--- trunk/plugins/file-manager/file-model.c	(original)
+++ trunk/plugins/file-manager/file-model.c	Mon Feb 16 20:35:19 2009
@@ -171,7 +171,6 @@
 		default:
 			emblem = NULL;
 	}
-	DEBUG_PRINT ("emblem found: %d", emblem != NULL);
 	return emblem;
 }