The real shell output plugin
- From: Roberto Majadas <phoenix nova es>
- To: gnome-devtools <gnome-devtools gnome org>
- Subject: The real shell output plugin
- Date: 11 Aug 2001 05:23:57 +0200
Hi everyone :
I'm sorry . The last patch that I send . It's not the real patch . I
don't know why and how , i send the same patch to time . This is the
real patch . So ... i'm soooorrrrryyyy ;o)
telemaco
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gIDE/ChangeLog,v
retrieving revision 1.130
diff -u -5 -r1.130 ChangeLog
--- ChangeLog 2001/08/10 06:29:31 1.130
+++ ChangeLog 2001/08/11 03:09:20
@@ -1,5 +1,9 @@
+2001-08-11 Roberto Majadas <phoenix nova es>
+
+ * plugins/shell-output/shell-output-tool.c: update the real patch ;)
+
2001-08-09 Jens Finke <jens gnome org>
* gide.spec.in: Updated spec file.
* configure.in: Added *_REQUIRED variables and appropriate
Index: plugins/shell-output/shell-output-tool.c
===================================================================
RCS file: /cvs/gnome/gIDE/plugins/shell-output/shell-output-tool.c,v
retrieving revision 1.2
diff -u -5 -r1.2 shell-output-tool.c
--- plugins/shell-output/shell-output-tool.c 2001/08/08 20:11:02 1.2
+++ plugins/shell-output/shell-output-tool.c 2001/08/11 03:09:22
@@ -1,24 +1,47 @@
+/* gIDE
+ *
+ * Copyright (C) 2001 Roberto Majadas "telemaco" <phoenix nova es>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+
/*
* gIDE Shell Output plugin
- *
- * With this plugin you can run command like in a shell .
- * And you can use pipes and pipe gide's documents .
*
- * Roberto Majadas "telemaco" <phoenix nova es>
+ * With this plugin yo can run command like in a shell .
+ * An you can use pipes and pipe gide's documents .
+ *
*/
#include <config.h>
#include <liboaf/liboaf.h>
#include <libgide/libgide.h>
+#include <bonobo.h>
+#include <bonobo/bonobo-stream-memory.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <gdl/GDL.h>
+#include <gdl/gdl.h>
#define SHELL_OUTPUT_COMPONENT_IID "OAFIID:GNOME_Development_Plugin:shelloutput"
#define SHELL_OUTPUT_BUFFER_SIZE 1024
#define SHELL_OUTPUT_SH_NAME "sh"
@@ -27,26 +50,16 @@
typedef struct _shell_output_dialog shell_output_dialog ;
typedef struct _shell_output_info shell_output_info ;
struct _shell_output_dialog {
GtkWidget *dialog;
- GtkWidget *dialog_vbox;
GtkWidget *vbox;
- GtkWidget *label1;
- GtkWidget *table;
- GtkWidget *label2;
- GtkWidget *label3;
- GtkWidget *optionmenu;
- GtkWidget *optionmenu_menu;
GtkWidget *entry;
- GtkWidget *fileentry1;
- GtkWidget *combo_entry1;
- GtkWidget *fileentry2;
- GtkWidget *combo_entry2;
- GtkWidget *dialog_action_area;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
+ GtkWidget *file_entry1;
+ GtkWidget *file_entry2;
+ GtkWidget *optionmenu;
+ GtkWidget *optionmenu_menu;
};
struct _shell_output_info {
GNOME_Development_Environment_DocumentManager_DocumentList *doclist ;
GNOME_Development_Environment_Document doc ;
@@ -60,93 +73,40 @@
/* Shell Output prototipes */
static void shell_output (GtkWidget *widget, gpointer data);
+static void shell_output_add_dialog_options ();
static void shell_output_create_dialog_table ();
static void shell_output_create_dialog ();
-static void shell_output_add_dialog_options ();
static void shell_output_activate_option (GtkWidget *widget, gpointer data);
static void shell_output_close_dialog (GtkWidget *widget, gpointer data);
static void shell_output_popen (GString *buffer_to_pipe, gchar *command);
+GString * shell_output_data_for_pipe_by_editorbuffer ();
+GString * shell_output_data_for_pipe_by_persist_stream ();
GString * shell_output_data_for_pipe () ;
static void shell_output_command_run (GtkWidget *widget, gpointer data);
static void shell_output_open_output_file (gchar *file);
-static void shell_output_error_box (gchar *message);
gboolean command_out_cb (GIOChannel *chan, GIOCondition cond, gpointer data);
-static void
-shell_output_create_dialog_table ()
-{
- gchar *temp_file_name = NULL ;
-
- sod->table = gtk_table_new (3, 2, FALSE);
- gtk_box_pack_end (GTK_BOX (sod->vbox), sod->table, FALSE, FALSE, 0);
- gtk_table_set_col_spacings (GTK_TABLE (sod->table), 5);
- sod->label2 = gtk_label_new (_("Work directory"));
- gtk_table_attach (GTK_TABLE (sod->table), sod->label2, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_widget_set_usize (sod->label2, 175, -2);
- gtk_misc_set_alignment (GTK_MISC (sod->label2), 0, 0.5);
- sod->label3 = gtk_label_new (_("Temporal output file"));
- gtk_table_attach (GTK_TABLE (sod->table), sod->label3, 0, 1, 2, 3,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_widget_set_usize (sod->label3, 175, -2);
- gtk_misc_set_alignment (GTK_MISC (sod->label3), 0, 0.5);
- sod->optionmenu = gtk_option_menu_new ();
- gtk_table_attach (GTK_TABLE (sod->table), sod->optionmenu, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gtk_widget_set_usize (sod->optionmenu, 175, 25);
- sod->optionmenu_menu = gtk_menu_new ();
- gtk_option_menu_set_menu (GTK_OPTION_MENU (sod->optionmenu), sod->optionmenu_menu);
- sod->entry = gtk_entry_new ();
- gtk_table_attach (GTK_TABLE (sod->table), sod->entry, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- sod->fileentry1 = gnome_file_entry_new (NULL, NULL);
- gtk_table_attach (GTK_TABLE (sod->table), sod->fileentry1, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gnome_file_entry_set_directory (GNOME_FILE_ENTRY (sod->fileentry1), TRUE);
- gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sod->fileentry1),
- g_get_home_dir ());
- sod->combo_entry1 = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (sod->fileentry1));
- gtk_entry_set_text (GTK_ENTRY(sod->combo_entry1),g_get_home_dir ());
- sod->fileentry2 = gnome_file_entry_new (NULL, NULL);
- gtk_table_attach (GTK_TABLE (sod->table), sod->fileentry2, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (0), 0, 0);
- gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sod->fileentry2),
- g_get_tmp_dir ());
- sod->combo_entry2 = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (sod->fileentry2));
-
- gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sod->fileentry2),
- g_get_tmp_dir ());
- gtk_entry_set_text (GTK_ENTRY(sod->combo_entry2), tempnam (g_get_tmp_dir (),"gide-"));
-
- g_free (temp_file_name);
-}
static void
shell_output_add_dialog_options ()
{
-
GNOME_Development_Environment_DocumentManager docman;
GNOME_Development_Environment_Document var_doc ;
CORBA_Environment ev;
GtkWidget *optionmenu_menu_item ;
gchar *moniker;
gchar *cat_option;
gchar *filename;
gint i ;
- soi->doc = NULL ; /* inicialization of this */
+ soi->doc = NULL ; /* inicialization */
- optionmenu_menu_item = gtk_menu_item_new_with_label (_("run command"));
+ optionmenu_menu_item = gtk_menu_item_new_with_label (_("run command"));
+ gtk_widget_show (optionmenu_menu_item);
gtk_menu_append (GTK_MENU (sod->optionmenu_menu), optionmenu_menu_item);
gtk_signal_connect (GTK_OBJECT (optionmenu_menu_item), "activate",
GTK_SIGNAL_FUNC (shell_output_activate_option),NULL);
CORBA_exception_init (&ev);
@@ -159,145 +119,257 @@
return ;
soi->doclist = GNOME_Development_Environment_DocumentManager_getOpenFiles (docman,&ev);
if (ev._major != CORBA_NO_EXCEPTION)
return ;
-
- for (i=0 ; i< soi->doclist->_length ; i++)
- {
+ for (i=0 ; i< soi->doclist->_length ; i++){
var_doc = soi->doclist->_buffer[i] ;
-
filename = g_strdup (GNOME_Development_Environment_Document_getFilename (var_doc,&ev));
if (ev._major != CORBA_NO_EXCEPTION)
- return ;
-
+ return ;
cat_option = g_strdup_printf ("cat %s |", g_basename(filename));
-
- optionmenu_menu_item = gtk_menu_item_new_with_label (cat_option);
+ optionmenu_menu_item = gtk_menu_item_new_with_label (cat_option);
+ gtk_widget_show (optionmenu_menu_item);
gtk_menu_append (GTK_MENU (sod->optionmenu_menu), optionmenu_menu_item);
gtk_signal_connect (GTK_OBJECT (optionmenu_menu_item), "activate",
GTK_SIGNAL_FUNC (shell_output_activate_option),
soi->doclist->_buffer[i]);
g_free(filename);
g_free(cat_option);
}
-
+ gtk_option_menu_set_menu (GTK_OPTION_MENU (sod->optionmenu), sod->optionmenu_menu);
gtk_option_menu_set_history (GTK_OPTION_MENU(sod->optionmenu), 0);
bonobo_object_release_unref(docman, &ev);
CORBA_exception_free(&ev);
}
static void
-shell_output_create_dialog ()
-{
- sod->dialog = gnome_dialog_new (NULL, NULL);
- gtk_widget_set_usize (sod->dialog, 450, 200);
- sod->dialog_vbox = GNOME_DIALOG (sod->dialog)->vbox;
- sod->vbox = gtk_vbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX (sod->dialog_vbox), sod->vbox, TRUE, FALSE, 0);
- sod->label1 = gtk_label_new (_("Please , insert command that you want to run\nRemember , you can pipe documents and commands like in a shell\n"));
- gtk_label_set_justify (GTK_LABEL(sod->label1), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start (GTK_BOX (sod->vbox), sod->label1, FALSE, FALSE, 0);
+shell_output_create_dialog_table ()
+{
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWidget *combo_entry;
+
+ table = gtk_table_new (3, 2, FALSE);
+ gtk_widget_show (table);
+ gtk_box_pack_start (GTK_BOX (sod->vbox), table, TRUE, TRUE, 0);
+ gtk_table_set_col_spacings (GTK_TABLE (table), 5);
+ label = gtk_label_new (_("Work directory"));
+ gtk_widget_show (label);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ label = gtk_label_new (_("Temporal output file"));
+ gtk_widget_show (label);
+ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
+ sod->optionmenu = gtk_option_menu_new ();
+ gtk_widget_show (sod->optionmenu);
+ gtk_table_attach (GTK_TABLE (table), sod->optionmenu, 0, 1, 0, 1,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ sod->optionmenu_menu = gtk_menu_new ();
+ shell_output_add_dialog_options ();
+ sod->entry = gtk_entry_new ();
+ gtk_widget_show (sod->entry);
+ gtk_table_attach (GTK_TABLE (table), sod->entry, 1, 2, 0, 1,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ sod->file_entry1 = gnome_file_entry_new (NULL, NULL);
+ gtk_widget_show (sod->file_entry1);
+ gtk_table_attach (GTK_TABLE (table), sod->file_entry1, 1, 2, 1, 2,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gnome_file_entry_set_directory (GNOME_FILE_ENTRY (sod->file_entry1), TRUE);
+ gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sod->file_entry1),
+ g_get_home_dir ());
+ combo_entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (sod->file_entry1));
+ gtk_widget_show (combo_entry);
+ gtk_entry_set_text (GTK_ENTRY(combo_entry), g_get_home_dir ());
+ sod->file_entry2 = gnome_file_entry_new (NULL, NULL);
+ gtk_widget_show (sod->file_entry2);
+ gtk_table_attach (GTK_TABLE (table), sod->file_entry2, 1, 2, 2, 3,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sod->file_entry2),
+ g_get_tmp_dir ());
+ combo_entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (sod->file_entry2));
+ gtk_widget_show (combo_entry);
+ gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (sod->file_entry2),
+ g_get_tmp_dir ());
+ gtk_entry_set_text (GTK_ENTRY(combo_entry), tempnam (g_get_tmp_dir (), "gide-"));
+}
- shell_output_create_dialog_table ();
+static void
+shell_output_create_dialog ()
+{
+ GtkWidget *label;
+ GtkWidget *dialog_vbox;
+ GtkWidget *frame;
- sod->dialog_action_area = GNOME_DIALOG (sod->dialog)->action_area;
- gtk_button_box_set_layout (GTK_BUTTON_BOX (sod->dialog_action_area), GTK_BUTTONBOX_END);
- gtk_button_box_set_spacing (GTK_BUTTON_BOX (sod->dialog_action_area), 8);
- gnome_dialog_append_button (GNOME_DIALOG (sod->dialog), GNOME_STOCK_BUTTON_OK);
- sod->ok_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (sod->dialog)->buttons)->data);
- GTK_WIDGET_SET_FLAGS (sod->ok_button, GTK_CAN_DEFAULT);
- gnome_dialog_append_button (GNOME_DIALOG (sod->dialog), GNOME_STOCK_BUTTON_CANCEL);
- sod->cancel_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (sod->dialog)->buttons)->data);
- GTK_WIDGET_SET_FLAGS (sod->cancel_button, GTK_CAN_DEFAULT);
+ sod->dialog = gnome_dialog_new (_("Shell output"), GNOME_STOCK_BUTTON_OK,
+ GNOME_STOCK_BUTTON_CANCEL, NULL);
+ gtk_window_set_policy (GTK_WINDOW (sod->dialog), FALSE, FALSE, FALSE);
+ dialog_vbox = GNOME_DIALOG (sod->dialog)->vbox;
+ gtk_widget_show (dialog_vbox);
+ sod->vbox = gtk_vbox_new (FALSE, 5);
+ gtk_widget_show (sod->vbox);
+ gtk_box_pack_start (GTK_BOX (dialog_vbox), sod->vbox, TRUE, TRUE, 0);
+ frame = gtk_frame_new (NULL);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (GTK_BOX (sod->vbox), frame, FALSE, FALSE, 0);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_OUT);
+ label = gtk_label_new (_("\nPlease , insert command that you want to run\n Remember , you can pipe documents and commands like in a shell \n"));
+ gtk_widget_show (label);
+ gtk_container_add (GTK_CONTAINER (frame), label);
+ shell_output_create_dialog_table ();
+ gnome_dialog_button_connect (GNOME_DIALOG (sod->dialog), 0,
+ GTK_SIGNAL_FUNC(shell_output_command_run), NULL);
+ gnome_dialog_button_connect (GNOME_DIALOG (sod->dialog), 1,
+ GTK_SIGNAL_FUNC (shell_output_close_dialog) , NULL);
gtk_signal_connect (GTK_OBJECT (sod->dialog), "delete_event",
GTK_SIGNAL_FUNC (shell_output_close_dialog), NULL);
- gtk_signal_connect (GTK_OBJECT (sod->cancel_button), "pressed",
- GTK_SIGNAL_FUNC (shell_output_close_dialog), NULL);
- gtk_signal_connect (GTK_OBJECT (sod->ok_button), "pressed",
- GTK_SIGNAL_FUNC (shell_output_command_run), NULL);
- shell_output_add_dialog_options ();
- gtk_widget_show_all (sod->dialog);
+ gtk_widget_show (sod->dialog);
}
-
static void
shell_output_activate_option (GtkWidget *widget, gpointer data)
-{
+{
soi->doc = data ;
}
gboolean
command_out_cb (GIOChannel *chan, GIOCondition cond, gpointer data)
{
-
FILE *temp_file;
gchar c;
gint read = 1;
-
+
temp_file = fopen (soi->temp_file_name, "w");
- while (read > 0)
- {
+ while (read > 0){
g_io_channel_read (chan, &c, 1, &read);
- if (read > 0)
- {
- fputc (c, temp_file);
- }
+ if (read > 0)
+ fputc (c, temp_file);
}
-
fclose (temp_file);
-
shell_output_open_output_file (soi->temp_file_name);
- g_free (soi);
+ g_io_channel_unref (chan);
+ g_io_channel_close (chan);
+ CORBA_free (soi->doclist) ;
+ g_free (soi->work_directory);
+ g_free (soi->temp_file_name);
+ g_free (soi);
return TRUE;
}
GString *
-shell_output_data_for_pipe ()
-{
+shell_output_data_for_pipe_by_editorbuffer ()
+{
GNOME_Development_EditorBuffer buffer;
GNOME_Development_EditorBuffer_iobuf *iobuf;
CORBA_Environment ev;
glong length;
- GString *result = g_string_new (NULL);
-
+ GString *result;
- if (soi->doc == NULL)
- {
- return result;
+ CORBA_exception_init(&ev);
+
+ buffer = GNOME_Development_Environment_Document_getEditorInterface(
+ soi->doc, "IDL:GNOME/Development/EditorBuffer:1.0", &ev);
+ if(CORBA_Object_is_nil(buffer, &ev)){
+ bonobo_object_release_unref (buffer, &ev);
+ CORBA_exception_free (&ev);
+ return NULL;
}
- else
- {
- CORBA_exception_init(&ev);
-
- buffer = GNOME_Development_Environment_Document_getEditorInterface(
- soi->doc, "IDL:GNOME/Development/EditorBuffer:1.0", &ev);
- if(CORBA_Object_is_nil(buffer, &ev))
- {
- g_print("not an editor buffer\n");
- CORBA_exception_free(&ev);
- return NULL;
- }
- length = GNOME_Development_EditorBuffer_getLength (buffer, &ev);
- if (length == 0)
- return result ;
- GNOME_Development_EditorBuffer_getChars (buffer, 0, length, &iobuf, &ev);
- result = g_string_append (result, g_strndup (iobuf->_buffer, iobuf->_length));
- CORBA_free (iobuf);
- bonobo_object_release_unref (buffer, &ev);
+
+ result = g_string_new (NULL);
+ length = GNOME_Development_EditorBuffer_getLength (buffer, &ev);
+ if (length == 0)
+ return result ;
+ GNOME_Development_EditorBuffer_getChars (buffer, 0, length, &iobuf, &ev);
+ result->str = g_strndup (iobuf->_buffer, iobuf->_length);
+ result->len = iobuf->_length ;
+ CORBA_free (iobuf);
+ bonobo_object_release_unref (buffer, &ev);
+
+ CORBA_exception_free (&ev);
+ return result ;
+}
- CORBA_exception_free (&ev);
+GString *
+shell_output_data_for_pipe_by_persist_stream ()
+{
+ Bonobo_PersistStream buffer_ps ;
+ BonoboStream *ret = NULL;
+ Bonobo_Stream_iobuf *iobufps;
+ CORBA_Environment ev;
+ glong length;
+ GString *result;
+
+ CORBA_exception_init(&ev);
+ ret = bonobo_stream_mem_create (NULL, 0, FALSE, TRUE);
+ buffer_ps = GNOME_Development_Environment_Document_getEditorInterface(
+ soi->doc,"IDL:Bonobo/PersistStream:1.0", &ev);
+
+ if (CORBA_Object_is_nil(buffer_ps, &ev)){
+ bonobo_object_release_unref (buffer_ps, &ev);
+ CORBA_exception_free (&ev);
+ return NULL;
+ }
+ result = g_string_new (NULL);
+ Bonobo_PersistStream_save (buffer_ps,
+ BONOBO_OBJREF (BONOBO_OBJECT (ret)),
+ "text/plain",
+ &ev);
+ length = bonobo_stream_client_get_length (BONOBO_OBJREF (BONOBO_OBJECT (ret)),
+ &ev);
+ if (length == 0)
+ return result;
+
+ Bonobo_Stream_seek ( BONOBO_OBJREF (BONOBO_OBJECT (ret)),
+ 0, Bonobo_Stream_SEEK_SET, &ev);
+ Bonobo_Stream_read (BONOBO_OBJREF (BONOBO_OBJECT (ret)),
+ length, &iobufps, &ev);
+ result->str = g_strndup (iobufps->_buffer, iobufps->_length);
+ result->len = iobufps->_length;
+ CORBA_free (iobufps);
+ bonobo_object_release_unref (buffer_ps, &ev);
+ CORBA_exception_free(&ev);
+
+ return result;
+
+}
+GString *
+shell_output_data_for_pipe ()
+{
+
+ GString *result ;
+
+ if (soi->doc == NULL){
+ result = g_string_new (NULL);
return result;
+ } else {
+ result = shell_output_data_for_pipe_by_editorbuffer ();
+ if (result==NULL){
+ result = shell_output_data_for_pipe_by_persist_stream();
+ if (result==NULL){
+ g_print ("gide can't read from component\n");
+ return NULL;
+ }
+ }
+ return result ;
}
}
static void
shell_output_command_run (GtkWidget *widget, gpointer data)
@@ -305,43 +377,47 @@
gchar *command_string = NULL;
GString *buffer_to_pipe = NULL;
command_string = gtk_entry_get_text (GTK_ENTRY (sod->entry));
-
soi->work_directory = g_strdup (gnome_file_entry_get_full_path
- (GNOME_FILE_ENTRY (sod->fileentry1),
+ (GNOME_FILE_ENTRY (sod->file_entry1),
TRUE));
soi->temp_file_name = g_strdup (gnome_file_entry_get_full_path
- (GNOME_FILE_ENTRY (sod->fileentry2),
+ (GNOME_FILE_ENTRY (sod->file_entry2),
FALSE));
- if (soi->work_directory == NULL)
- {
- shell_output_error_box (_("There aren't any work directory"));
+ if (soi->work_directory == NULL){
+ gnome_warning_dialog (_("There aren't any work directory"));
return;
}
- if (soi->temp_file_name == NULL)
- {
- shell_output_error_box (_("There aren't any temporal file"));
+ if (soi->temp_file_name == NULL){
+ gnome_warning_dialog (_("There aren't any temporal file"));
return;
}
- if (command_string == NULL || (strlen (command_string) == 0))
- {
- shell_output_error_box (_("There aren't any command"));
+ if (command_string == NULL || (strlen (command_string) == 0)){
+ gnome_warning_dialog (_("There aren't any command"));
return;
}
-
buffer_to_pipe = shell_output_data_for_pipe ();
+ if (buffer_to_pipe==NULL){
+ /* If the return is NULL this mean that the component is not
+ soportated */
+ gnome_error_dialog (_("gIDE can't read from this text-component\n"));
+ gnome_dialog_close (GNOME_DIALOG (sod->dialog));
+ g_free (sod);
+ CORBA_free (soi->doclist) ;
+ g_free (soi->work_directory);
+ g_free (soi->temp_file_name);
+ g_free (soi);
+ return;
+ }
chdir (soi->work_directory);
-
shell_output_popen (buffer_to_pipe, command_string);
-
gnome_dialog_close (GNOME_DIALOG (sod->dialog));
g_free (sod);
-
}
static void
shell_output_popen (GString *buffer_to_pipe, gchar *command)
{
@@ -350,60 +426,52 @@
gint fdpipe [2];
gint fdpipe2 [2];
gchar *arg[4] ;
gchar *command_to_run;
gint pid;
-
+
if (pipe (fdpipe) == -1)
return;
-
if (pipe (fdpipe2) == -1)
return;
-
if (buffer_to_pipe->len > 0)
command_to_run = g_strdup_printf ("cat | %s", command);
else
command_to_run = g_strdup_printf (" %s ", command);
pid = fork();
- if (pid == 0)
- {
+ if (pid == 0){
dup2(fdpipe[0], 0);
close (fdpipe[0]);
close (fdpipe[1]);
dup2(fdpipe2[1], 1);
close (fdpipe2[0]);
close (fdpipe2[1]);
- chan_out = g_io_channel_unix_new (fdpipe2[0]);
- g_io_add_watch (chan_out, G_IO_IN, command_out_cb, NULL);
-
arg[0]=SHELL_OUTPUT_SH_NAME;
arg[1]="-c";
arg[2]=command_to_run;
arg[3]=NULL;
execvp (SHELL_OUTPUT_SH_PATH, arg);
g_warning ("A undetermined PIPE problem occurred");
_exit (1);
- }
- else
- {
+ } else {
close (fdpipe[0]);
close (fdpipe2[1]);
chan_out = g_io_channel_unix_new (fdpipe2[0]);
- g_io_add_watch (chan_out, G_IO_IN, command_out_cb, NULL);
+ g_io_add_watch (chan_out, G_IO_IN, command_out_cb, NULL);
- if (buffer_to_pipe->len > 0)
- {
+ if (buffer_to_pipe->len > 0){
fcntl (fdpipe[1], F_SETFD, FD_CLOEXEC);
stream = fdopen (fdpipe[1], "w");
fprintf (stream, buffer_to_pipe->str);
- fclose (stream);
- }
+ fclose (stream);
+ }
+
g_string_free ( buffer_to_pipe, TRUE ) ;
}
}
static void
@@ -424,32 +492,10 @@
var_doc = GNOME_Development_Environment_DocumentManager_openFile (docman, file, &ev);
bonobo_object_release_unref (docman, &ev);
CORBA_exception_free (&ev);
-}
-
-static void
-shell_output_error_box (gchar *message)
-{
- GtkWidget *messagebox;
- GtkWidget *dialog_vbox;
- GtkWidget *ok_button;
- GtkWidget *dialog_action_area;
-
- messagebox = gnome_message_box_new (message, GNOME_MESSAGE_BOX_WARNING,
- GNOME_STOCK_BUTTON_OK, NULL);
- gtk_container_remove (GTK_CONTAINER (GNOME_DIALOG (messagebox)->action_area),
- GNOME_DIALOG (messagebox)->buttons->data);
- GNOME_DIALOG (messagebox)->buttons = NULL;
- gtk_window_set_policy (GTK_WINDOW (messagebox), FALSE, FALSE, FALSE);
- dialog_vbox = GNOME_DIALOG (messagebox)->vbox;
- gnome_dialog_append_button (GNOME_DIALOG (messagebox), GNOME_STOCK_BUTTON_OK);
- ok_button = GTK_WIDGET (g_list_last (GNOME_DIALOG (messagebox)->buttons)->data);
- GTK_WIDGET_SET_FLAGS (ok_button, GTK_CAN_DEFAULT);
- dialog_action_area = GNOME_DIALOG (messagebox)->action_area;
- gtk_widget_show_all (messagebox);
}
static void
shell_output_close_dialog (GtkWidget *widget, gpointer data)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
