antiright-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Antiright-devel] antiright ChangeLog Makefile ACE-desktop/datelo...


From: Jeffrey Bedard
Subject: [Antiright-devel] antiright ChangeLog Makefile ACE-desktop/datelo...
Date: Fri, 09 Feb 2007 03:16:12 +0000

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/09 03:16:12

Modified files:
        .              : ChangeLog Makefile 
        ACE-desktop    : dateload.c 
        gshterm        : gshterm.c main.c 
        gtkshell       : Makefile arguments.c callbacks.c gtkshell.c 
                         gtkshell.h row.c row.h updated.c 
                         updated_options.c 
        libantiright   : library.h system.c system.h util.h 
Added files:
        gtkshell       : containers.c containers.h 

Log message:
        Updated ChangeLog.  Added ctags generation to Makefile.
        Added UNUSED macro.  Added sysprintf() and vsysprintf().
        Refactored gshterm command generation.  Split out
        container management code in gtkshell.[ch] to containers.[ch].

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ChangeLog?cvsroot=antiright&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/antiright/Makefile?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/dateload.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/main.c?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.c?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/containers.h?cvsroot=antiright&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/system.c?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/system.h?cvsroot=antiright&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.h?cvsroot=antiright&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/antiright/antiright/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- ChangeLog   4 Feb 2007 06:58:18 -0000       1.57
+++ ChangeLog   9 Feb 2007 03:16:11 -0000       1.58
@@ -1,3 +1,42 @@
+2007-02-08 18:22  jefbed
+
+       * Makefile, gshedit/Makefile, gshedit/main.c, gshterm/Makefile,
+         gshterm/gshterm.c, gshterm/gshterm.h, gshterm/main.c,
+         gtkshell/callbacks.c, gtkshell/callbacks.h, gtkshell/text.c,
+         libantiright/util.c: Added tags generation to main makefile.
+         Added geometry support to gshterm.  Removed gshedit.
+
+2007-02-07 11:44  jefbed
+
+       * doc/TODO, doc/gtkshell.1, gtkshell/options.c, gtkshell/row.c,
+         gtkshell/row.h: Began revision of manual page.  Added stub for
+         help option.  Added files row.[ch] to store row container handling
+         functions.
+
+2007-02-07 11:28  jefbed
+
+       * configure: Bumped version to 2.99.6
+
+2007-02-07 11:27  jefbed
+
+       * gtkshell/: options.c, updated_options.c: Refactored
+         updated_options.c switch.  Use g_printerr for undefined error in
+         options.c.
+
+2007-02-07 11:05  jefbed
+
+       * gtkshell/: add_options.c, updated_label.c: A check for empty
+         output was added to updated_label.c to prevent a gtk warning.
+
+2007-02-05 10:55  jefbed
+
+       * configure: Fixed stow path in -s option to configure.
+
+2007-02-04 01:58  jefbed
+
+       * ChangeLog, Makefile, config.mk, configure, ACE-desktop/Makefile,
+         gshterm/main.c: Removed gshedit.  gshterm is fully functional.
+
 2007-02-03 23:44  jefbed
 
        * Makefile, config.mk, ACE-desktop/Makefile, ACE-desktop/config.mk,

Index: Makefile
===================================================================
RCS file: /sources/antiright/antiright/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Makefile    8 Feb 2007 23:22:30 -0000       1.8
+++ Makefile    9 Feb 2007 03:16:12 -0000       1.9
@@ -31,7 +31,7 @@
        cd gtkshell && $(MAKE)
        cd gshterm && $(MAKE)
        cd ACE-desktop && $(MAKE)
-       ctags -t */*.[ch] ACE-desktop/ACE
+       ctags -w -t */*.[ch] ACE-desktop/ACE
 
 clean:
        cd libantiright && $(MAKE) clean

Index: ACE-desktop/dateload.c
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/dateload.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ACE-desktop/dateload.c      3 Feb 2007 20:11:14 -0000       1.1
+++ ACE-desktop/dateload.c      9 Feb 2007 03:16:12 -0000       1.2
@@ -2,12 +2,17 @@
 #include <stdlib.h>
 #include <time.h>
 
+#define UNUSED(arg) { arg=arg; }
+
 int main(int argc, char **argv)
 {
        char *date;
        double loadavg[3];
        time_t time_data;
 
+       UNUSED(argc);
+       UNUSED(argv);
+
        time(&time_data);
        date=ctime(&time_data);
        

Index: gshterm/gshterm.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gshterm/gshterm.c   8 Feb 2007 23:22:30 -0000       1.1
+++ gshterm/gshterm.c   9 Feb 2007 03:16:12 -0000       1.2
@@ -29,7 +29,7 @@
 {
        char *sys_command;
 
-       asprintf(&sys_command, "rm -f %s", data);
+       asprintf(&sys_command, "rm -f %s", (char*)data);
        system(sys_command);
        free(sys_command);
 }
@@ -37,6 +37,8 @@
 void
 gshterm_exit_cb(GtkWidget *widget, gpointer data)
 {
+       UNUSED(widget);
+
        gshterm_delete_tmp(data);
        exit(0);
 }
@@ -62,10 +64,10 @@
 
        return(terminal);
 }
+
 char*
 gshterm_command_script(char *command)
 {
-       char *sys_command;
        char *script_name;
        pid_t pid;
 
@@ -75,61 +77,73 @@
        pid=getpid();
 
        asprintf(&script_name, "/tmp/gshterm.%d", (int)pid);
-       asprintf(&sys_command, "echo '#!/bin/sh' > %s", script_name);
-       system(sys_command);
-       free(sys_command);
 
-       asprintf(&sys_command, "echo %s >> %s", command, script_name);
+       sysprintf("echo '#!/bin/sh' > %s", script_name);
+       sysprintf("echo %s >> %s", command, script_name);
        free(command);
-       system(sys_command);
-       free(sys_command);
-
-       asprintf(&sys_command, "chmod +x %s", script_name);
-       system(sys_command);
-       free(sys_command);
+       sysprintf("chmod +x %s", script_name);
+       sysprintf("cat %s", script_name);
 
        return(script_name);
 }
-void
+
+gboolean
 gshterm_handle_command_line_option(gchar option, gchar *arg)
 {
+       gboolean exec_reached=FALSE;
+
        putchar(option);
        assert(arg);
        switch(option)
        {
+               case 'e':
+                       exec_reached=TRUE;
+                       break;
                case 'g':
                        asprintf(&gsh_geometry, arg);
                        break;
                default:
                        g_printerr("unknown option");
        }
+
+       return(exec_reached);
 }
-char*
-gshterm_construct_command(int argc, char **argv)
+gboolean
+gshterm_construct_command_from_args(int argc, char **argv, gchar **command)
 {
-       gchar *command;
+       int counter;
        gboolean exec_reached;
-       unsigned int counter;
 
-       command=""; /* Initialize to empty for
-                      the first concatenation.  */
+       puts(*command);
 
        for(counter=1, exec_reached=FALSE; counter < argc; counter++)
        {
                if(exec_reached)
-                       asprintf(&command, "%s %s ", command, argv[counter]);
-               else if(!strncmp(argv[counter], "-e", 2))
-                       exec_reached=TRUE;
+                       asprintf(command, "%s %s ", *command, argv[counter]);
                else if(argv[counter][0] == '-')
-               {
-                       gshterm_handle_command_line_option(
+                       exec_reached=gshterm_handle_command_line_option(
                                argv[counter][1], argv[counter+1]);
-                       counter++;
-               }
-               g_print("\n\t%s\n", argv[counter]);
+
+#ifdef DEBUG
+               g_print("\n%d\t%s\n", counter, argv[counter]);
+#endif /* DEBUG */
+
        }
 
-       if(!exec_reached)
+       return(exec_reached);
+
+}
+
+char*
+gshterm_construct_command(int argc, char **argv)
+{
+       gchar *command;
+
+       command=""; /* Initialize to empty for
+                      the first concatenation.  */
+
+       if(!gshterm_construct_command_from_args(
+               argc, argv, &command))
                asprintf(&command, "/bin/sh");
 
        return(command);

Index: gshterm/main.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gshterm/main.c      8 Feb 2007 23:22:30 -0000       1.3
+++ gshterm/main.c      9 Feb 2007 03:16:12 -0000       1.4
@@ -30,8 +30,7 @@
        char *script_name;
        GtkWidget *terminal;
 
-       gtk_init(&argc, &argv);
-       gsh_window=gsh_create_main_window();
+       gsh_init(&argc, &argv);
 
        terminal=gshterm_setup_terminal();
 
@@ -39,7 +38,10 @@
                gshterm_construct_command(argc, argv));
 
        gsh_check_and_set_geometry();
+
+#ifdef DEBUG   
        puts(gsh_geometry);
+#endif /* DEBUG */
 
        g_signal_connect(G_OBJECT(terminal), "child-exited",
                G_CALLBACK(gshterm_exit_cb), script_name);

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/Makefile   1 Feb 2007 20:45:49 -0000       1.2
+++ gtkshell/Makefile   9 Feb 2007 03:16:12 -0000       1.3
@@ -8,7 +8,7 @@
 objects=gtkshell.o arguments.o options.o callbacks.o updated.o\
        label.o button.o text.o updated_label.o updated_progress.o\
        updated_options.o add_options.o option_options.o dialog_options.o\
-       file_dialog.o
+       file_dialog.o row.o containers.o
 all: $(objects) main.o
        cc -o gtkshell $(objects) main.o $(LDFLAGS)
        ar rcs libgtkshell.a $(objects)

Index: gtkshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/arguments.c        1 Feb 2007 20:45:49 -0000       1.1
+++ gtkshell/arguments.c        9 Feb 2007 03:16:12 -0000       1.2
@@ -22,30 +22,8 @@
 
 #include "gtkshell.h"
 
-unsigned int gsh_rows=8;
-unsigned int gsh_row=1;
-
-void
-gsh_new_row()
-{
- gsh_vbox = gtk_vbox_new(FALSE, 2);
- gtk_container_add(GTK_CONTAINER(gsh_hbox), gsh_vbox);
- gtk_widget_show(gsh_vbox);
- gsh_row = 1;
-}
-
-void
-gsh_check_row()
-{
-#ifdef DEBUG
- printf("==> gsh_row: %d, gsh_rows: %d\n", gsh_row, gsh_rows);
-#endif
-
- if(gsh_row > gsh_rows)
- {
-  gsh_new_row();
- }
-}
+extern unsigned int gsh_rows;
+extern unsigned int gsh_row;
 
 void
 gsh_parse_arguments(int argc, char **argv)

Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/callbacks.c        8 Feb 2007 23:22:31 -0000       1.2
+++ gtkshell/callbacks.c        9 Feb 2007 03:16:12 -0000       1.3
@@ -34,7 +34,7 @@
 void
 system_cb(GtkWidget * widget, gpointer data)
 {
-       widget=NULL;
+       UNUSED(widget);
 
        antiright_system(data);
        gsh_test_exit();

Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/gtkshell.c 4 Feb 2007 04:44:24 -0000       1.2
+++ gtkshell/gtkshell.c 9 Feb 2007 03:16:12 -0000       1.3
@@ -22,53 +22,9 @@
 
 #include "gtkshell.h"
 
-extern unsigned int gsh_rows;
-extern unsigned int gsh_row;
-GtkWidget *scrolled_window;
-gboolean gsh_dont_scroll=FALSE;
 extern char *gsh_geometry;
 
 void
-gsh_setup_scrolled_window()
-{
-       scrolled_window=gtk_scrolled_window_new(NULL,NULL);
-       gtk_scrolled_window_set_policy(
-               GTK_SCROLLED_WINDOW(scrolled_window),
-               GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-       gtk_scrolled_window_set_shadow_type(
-               GTK_SCROLLED_WINDOW(scrolled_window),
-               GTK_SHADOW_OUT);
-       gtk_container_add(GTK_CONTAINER(gsh_window), 
-               scrolled_window);
-       gtk_widget_show(scrolled_window);
-
-}
-
-void
-gsh_setup_containers()
-{
-       gsh_hbox = gtk_hbox_new(FALSE, 2);
-       
-       if(!gsh_dont_scroll)
-       {
-               gsh_setup_scrolled_window();
-               gtk_scrolled_window_add_with_viewport(
-                       GTK_SCROLLED_WINDOW(scrolled_window), 
-                       gsh_hbox);
-       }
-       else
-       {
-               gtk_container_add(GTK_CONTAINER(gsh_window),
-                       gsh_hbox);
-       }
-
- gtk_widget_show(gsh_hbox);
- gsh_vbox = gtk_vbox_new(FALSE, 2);
- gtk_container_add(GTK_CONTAINER(gsh_hbox), gsh_vbox);
- gtk_widget_show(gsh_vbox);
-}
-
-void
 gsh_set_geometry()
 {
        assert(gsh_geometry);
@@ -92,18 +48,6 @@
 
 }
 
-void
-gsh_manage(GtkWidget *widget)
-{
- gsh_check_row();
- gtk_container_add(GTK_CONTAINER(gsh_vbox), widget);
- gtk_widget_show(widget);
- gsh_row++;
-#ifdef DEBUG
- printf("gsh_row: %d, gsh_rows: %d\n", gsh_row, gsh_rows);
-#endif
-}
-
 GtkWidget *
 gsh_create_main_window()
 {
@@ -119,4 +63,10 @@
        return(window);         
 }
 
+void
+gsh_init(int *argc, char ***argv)
+{
+       gtk_init(argc, argv);
+       gsh_window=gsh_create_main_window();
+}
 

Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/gtkshell.h 4 Feb 2007 04:44:24 -0000       1.2
+++ gtkshell/gtkshell.h 9 Feb 2007 03:16:12 -0000       1.3
@@ -40,6 +40,8 @@
 #include "add_options.h"
 #include "dialog_options.h"
 #include "file_dialog.h"
+#include "row.h"
+#include "containers.h"
 
 GtkWidget      *gsh_window;
 GtkWidget      *gsh_hbox;
@@ -48,13 +50,7 @@
 
 
 void
-gsh_manage(GtkWidget *widget);
-
-void
-gsh_setup_scrolled_window();
-
-void
-gsh_setup_containers();
+gsh_init(int *argc, char ***argv);
 
 void
 gsh_set_geometry();

Index: gtkshell/row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/row.c      7 Feb 2007 16:44:23 -0000       1.1
+++ gtkshell/row.c      9 Feb 2007 03:16:12 -0000       1.2
@@ -0,0 +1,64 @@
+/*
+  AntiRight
+  (c) 2007 Jeffrey Bedard
+  address@hidden
+
+  This file is part of AntiRight.
+
+  AntiRight 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.
+
+  AntiRight 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 AntiRight; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
+*/
+
+#include "gtkshell.h"
+
+unsigned int gsh_rows=8;
+unsigned int gsh_row=1;
+
+void
+gsh_manage(GtkWidget *widget)
+{
+ gsh_check_row();
+ gtk_container_add(GTK_CONTAINER(gsh_vbox), widget);
+ gtk_widget_show(widget);
+ gsh_row++;
+#ifdef DEBUG
+ printf("gsh_row: %d, gsh_rows: %d\n", gsh_row, gsh_rows);
+#endif
+}
+
+
+void
+gsh_new_row()
+{
+ gsh_vbox = gtk_vbox_new(FALSE, 2);
+ gtk_container_add(GTK_CONTAINER(gsh_hbox), gsh_vbox);
+ gtk_widget_show(gsh_vbox);
+ gsh_row = 1;
+}
+
+void
+gsh_check_row()
+{
+#ifdef DEBUG
+ printf("==> gsh_row: %d, gsh_rows: %d\n", gsh_row, gsh_rows);
+#endif
+
+ if(gsh_row > gsh_rows)
+ {
+  gsh_new_row();
+ }
+}
+
+
+

Index: gtkshell/row.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/row.h      7 Feb 2007 16:44:23 -0000       1.1
+++ gtkshell/row.h      9 Feb 2007 03:16:12 -0000       1.2
@@ -0,0 +1,34 @@
+/*
+  AntiRight
+  (c) 2007 Jeffrey Bedard
+  address@hidden
+
+  This file is part of AntiRight.
+
+  AntiRight 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.
+
+  AntiRight 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 AntiRight; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
+*/
+#ifndef GSH_ROW_H
+#define GSH_ROW_H
+
+void
+gsh_manage(GtkWidget *widget);
+
+void
+gsh_new_row();
+
+void
+gsh_check_row();
+
+#endif /* GSH_ROW_H */

Index: gtkshell/updated.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- gtkshell/updated.c  1 Feb 2007 20:45:49 -0000       1.1
+++ gtkshell/updated.c  9 Feb 2007 03:16:12 -0000       1.2
@@ -78,7 +78,7 @@
        gsh_updater_data *item;
 
 
-       user_data=NULL; /* USER_DATA is unused.  */ 
+       UNUSED(user_data); /* USER_DATA is unused.  */ 
 
        /* Ensure that the argument containing 
        the structure is not empty.  */
@@ -100,7 +100,7 @@
        g_message("gsh_perform_updates()");
 #endif
        
-       data=NULL; /* DATA is unused.  */
+       UNUSED(data); /* DATA is unused.  */
 
        g_slist_foreach(gsh_updater_list, gsh_update_each, NULL);
        

Index: gtkshell/updated_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_options.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/updated_options.c  7 Feb 2007 16:27:48 -0000       1.2
+++ gtkshell/updated_options.c  9 Feb 2007 03:16:12 -0000       1.3
@@ -36,7 +36,7 @@
 }
 
 void
-gsh_updater_argument_generic(int argc, char **argv, unsigned int *counter)
+gsh_updater_argument_generic(int argc, unsigned int *counter)
 {
     gsh_count(argc, counter);
     gsh_test_updating();
@@ -50,11 +50,11 @@
        {
                case 'l':
                        gsh_add_updated_label(argv[*counter+1]);
-            gsh_updater_argument_generic(argc, argv, counter);
+            gsh_updater_argument_generic(argc, counter);
                        break;
                case 'p':
             gsh_add_updated_progress(argv[*counter+1]);
-            gsh_updater_argument_generic(argc, argv, counter);
+            gsh_updater_argument_generic(argc, counter);
                        break;
        }
 }

Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libantiright/library.h      12 Aug 2006 03:52:48 -0000      1.1
+++ libantiright/library.h      9 Feb 2007 03:16:12 -0000       1.2
@@ -28,6 +28,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <stdarg.h>
 
 #include "pipe.h"
 #include "string.h"

Index: libantiright/system.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/system.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libantiright/system.c       12 Aug 2006 03:52:48 -0000      1.1
+++ libantiright/system.c       9 Feb 2007 03:16:12 -0000       1.2
@@ -1,6 +1,6 @@
 /*
   AntiRight
-  (c) 2002-2006 Jeffrey Bedard
+  (c) 2002-2007 Jeffrey Bedard
   address@hidden
  
   This file is part of AntiRight.
@@ -64,3 +64,27 @@
     }  
 }
 
+int
+vsysprintf(char *format, va_list list)
+{
+       char *command;
+       int return_value;
+
+       vasprintf(&command, format, list);
+       return_value=antiright_system(command);
+       free(command);
+       return(return_value);
+}
+
+int
+sysprintf(char *format, ...)
+{
+       va_list list;
+       int return_value;
+
+       va_start(list, format);
+       return_value=vsysprintf(format, list);
+       va_end(list);
+       return(return_value);
+}
+

Index: libantiright/system.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/system.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libantiright/system.h       12 Aug 2006 03:52:48 -0000      1.1
+++ libantiright/system.h       9 Feb 2007 03:16:12 -0000       1.2
@@ -1,6 +1,6 @@
 /*
   AntiRight
-  (c) 2002-2005 Jeffrey Bedard
+  (c) 2002-2007 Jeffrey Bedard
   address@hidden
 
   This file is part of AntiRight.
@@ -22,7 +22,15 @@
 
 #ifndef LIBAR_SYSTEM_H
 #define LIBAR_SYSTEM_H
+
 int
 antiright_system(char *field_string);
-#endif
+
+int
+sysprintf(char *format, ...);
+
+int
+vsysprintf(char *format, va_list list);
+
+#endif /* LIBAR_SYSTEM_H */
 

Index: libantiright/util.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libantiright/util.h 12 Aug 2006 03:52:48 -0000      1.1
+++ libantiright/util.h 9 Feb 2007 03:16:12 -0000       1.2
@@ -24,8 +24,8 @@
 #define LIBAR_UTIL_H
 void *
 xmalloc(size_t size);
-/* char *  */
-/* antiright_get_file_extension(char *filename); */
+
+#define UNUSED(arg) { arg = arg; }
 
 #endif
 

Index: gtkshell/containers.c
===================================================================
RCS file: gtkshell/containers.c
diff -N gtkshell/containers.c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gtkshell/containers.c       9 Feb 2007 03:16:12 -0000       1.1
@@ -0,0 +1,69 @@
+/*
+  AntiRight
+  (c) 2002-2006 Jeffrey Bedard
+  address@hidden
+
+  This file is part of AntiRight.
+
+  AntiRight 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.
+
+  AntiRight 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 AntiRight; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
+*/
+
+#include "gtkshell.h"
+
+GtkWidget *scrolled_window;
+gboolean gsh_dont_scroll=FALSE;
+
+void
+gsh_setup_scrolled_window()
+{
+       scrolled_window=gtk_scrolled_window_new(NULL,NULL);
+       gtk_scrolled_window_set_policy(
+               GTK_SCROLLED_WINDOW(scrolled_window),
+               GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type(
+               GTK_SCROLLED_WINDOW(scrolled_window),
+               GTK_SHADOW_OUT);
+       gtk_container_add(GTK_CONTAINER(gsh_window), 
+               scrolled_window);
+       gtk_widget_show(scrolled_window);
+
+}
+
+void
+gsh_setup_containers()
+{
+       gsh_hbox = gtk_hbox_new(FALSE, 2);
+       
+       if(!gsh_dont_scroll)
+       {
+               gsh_setup_scrolled_window();
+               gtk_scrolled_window_add_with_viewport(
+                       GTK_SCROLLED_WINDOW(scrolled_window), 
+                       gsh_hbox);
+       }
+       else
+       {
+               gtk_container_add(GTK_CONTAINER(gsh_window),
+                       gsh_hbox);
+       }
+
+ gtk_widget_show(gsh_hbox);
+ gsh_vbox = gtk_vbox_new(FALSE, 2);
+ gtk_container_add(GTK_CONTAINER(gsh_hbox), gsh_vbox);
+ gtk_widget_show(gsh_vbox);
+}
+
+
+

Index: gtkshell/containers.h
===================================================================
RCS file: gtkshell/containers.h
diff -N gtkshell/containers.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gtkshell/containers.h       9 Feb 2007 03:16:12 -0000       1.1
@@ -0,0 +1,34 @@
+/*
+  AntiRight
+  (c) 2002-2006 Jeffrey Bedard
+  address@hidden
+
+  This file is part of AntiRight.
+
+  AntiRight 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.
+
+  AntiRight 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 AntiRight; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
+*/
+
+#ifndef GSH_CONTAINERS_H
+#define GSH_CONTAINERS_H
+
+void
+gsh_setup_scrolled_window();
+
+void
+gsh_setup_containers();
+
+#endif /* GSH_CONTAINERS_H */
+
+




reply via email to

[Prev in Thread] Current Thread [Next in Thread]