[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright gtkshell/button.c gtkshell/callbacks....
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright gtkshell/button.c gtkshell/callbacks.... |
|
Date: |
Fri, 02 Mar 2007 19:12:01 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/03/02 19:12:01
Modified files:
gtkshell : button.c callbacks.c dragdrop.c image_button.h
text.c updated.c updated.h updated_label.c
updated_options.c updated_progress.c
libantiright : pipe.c
Log message:
Fixed off-by-one error in add_updater. Use const gchar * in various
places that do not require data to be changed. Fixed warnings.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/dragdrop.c?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/image_button.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.c?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated.h?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_options.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/pipe.c?cvsroot=antiright&r1=1.6&r2=1.7
Patches:
Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- gtkshell/button.c 2 Mar 2007 03:56:07 -0000 1.16
+++ gtkshell/button.c 2 Mar 2007 19:12:00 -0000 1.17
@@ -37,22 +37,12 @@
void
gsh_command_button(struct GSH * gsh, char *command)
{
- char *label_text;
- struct GSH_CBData *cb;
-
#ifdef DEBUG
ARBUG("gsh_command_button");
#endif /* DEBUG */
- /* Allocate and initialize elements. */
- cb = (struct GSH_CBData *) xmalloc(sizeof(struct GSH_CBData));
-
ARPASSERT(gsh);
- cb->gsh = gsh;
-
- cb->data = command; /* command from argv, literal, or
- * preallocated. */
gsh->button = gtk_button_new();
@@ -60,10 +50,22 @@
gsh_setup_drag_drop(gsh, gsh->button);
+ {
+ struct GSH_CBData * cb;
+
+ /* Allocate and initialize elements. */
+ cb = (struct GSH_CBData *) xmalloc(sizeof(struct GSH_CBData));
+
+ cb->gsh = gsh;
+ cb->data = command; /* command from argv, literal, or
+ * preallocated. */
+
/* @null@ */
(void) g_signal_connect(G_OBJECT(gsh->button), "clicked",
G_CALLBACK(system_cb), cb);
+ }
+
gsh_manage_unexpanded(gsh, gsh->button);
#ifdef DEBUG
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/callbacks.c 2 Mar 2007 03:56:07 -0000 1.14
+++ gtkshell/callbacks.c 2 Mar 2007 19:12:00 -0000 1.15
@@ -38,31 +38,6 @@
#endif /* DEBUG */
}
-static void
-find_cd(gchar * command)
-{
- gint length;
- gint i;
-
- length=strlen(command);
- for(i=0; (i+3) < length; i++)
- {
- if(strncmp((command+i), "cd ", 3) == 0)
- {
- gchar *directory;
-
- command+=i+3;
- length=strlen(command);
- for(i=0; (i < length) && (command[i] != ' '); i++);
- directory=(gchar *)xmalloc(sizeof(gchar)*(i+1));
- strncpy(directory, command, i+3);
- g_chdir(directory);
- g_free(directory);
- break;
- }
- }
-}
-
void
system_cb(GtkWidget *widget, gpointer data)
{
@@ -97,11 +72,12 @@
ARWIFNP(cb)
{
- ARIFB((cb->gsh->bflags & GSH_PROMPT_ECHOES)
+ if((cb->gsh->bflags & GSH_PROMPT_ECHOES)
== GSH_PROMPT_ECHOES)
g_print("%s\n", input);
else
- sysprintf("%s %s", (char *) cb->data, (char *) input);
+ sysprintf("%s %s", (char *) cb->data,
+ (char *) input);
gsh_test_exit(cb->gsh);
}
Index: gtkshell/dragdrop.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/dragdrop.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/dragdrop.c 2 Mar 2007 03:56:07 -0000 1.7
+++ gtkshell/dragdrop.c 2 Mar 2007 19:12:00 -0000 1.8
@@ -51,11 +51,11 @@
GtkSelectionData * selection, guint target_type,
guint time, gpointer data);
-static void
+/*static void
drag_begin(GtkWidget *widget, GdkDragContext * context, gpointer data);
static void
- drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data);
+ drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data);*/
void
gsh_setup_drag_drop(struct GSH * gsh, GtkWidget *widget)
@@ -86,6 +86,10 @@
{
gboolean drag_status;
+ UNUSED(x);
+ UNUSED(y);
+ UNUSED(data);
+
switch (target_type)
{
case TARGET_STRING:
@@ -111,6 +115,10 @@
{
GdkAtom target_type;
+ UNUSED(x);
+ UNUSED(y);
+ UNUSED(data);
+
target_type =
GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets,
TARGET_STRING));
@@ -131,6 +139,10 @@
{
const gchar *source_data;
+ UNUSED(context);
+ UNUSED(target_type);
+ UNUSED(time);
+ UNUSED(data);
source_data = gtk_button_get_label(GTK_BUTTON(widget));
@@ -139,7 +151,7 @@
}
/* Use to set icon. */
-static void
+/*static void
drag_begin(GtkWidget *widget, GdkDragContext * context, gpointer data)
{
}
@@ -147,4 +159,4 @@
static void
drag_end(GtkWidget *widget, GdkDragContext * context, gpointer data)
{
-}
+}*/
Index: gtkshell/image_button.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/image_button.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/image_button.h 2 Mar 2007 15:40:01 -0000 1.2
+++ gtkshell/image_button.h 2 Mar 2007 19:12:00 -0000 1.3
@@ -38,5 +38,10 @@
gsh_stock_image_button(struct GSH * gsh, char *command,
char *stock_id);
+void
+gsh_handle_add_stock_button(struct GSH * gsh, int argc, char **argv,
+ int * counter);
+
+
#endif /* GSH_IMAGE_BUTTON_H */
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/text.c 2 Mar 2007 03:56:07 -0000 1.14
+++ gtkshell/text.c 2 Mar 2007 19:12:00 -0000 1.15
@@ -75,8 +75,6 @@
{
GtkWidget *widget;
GtkTextBuffer *buffer;
- GtkTextIter iter;
- size_t read;
FILE *file;
ARPASSERT(gsh);
Index: gtkshell/updated.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/updated.c 2 Mar 2007 16:41:43 -0000 1.11
+++ gtkshell/updated.c 2 Mar 2007 19:12:00 -0000 1.12
@@ -41,8 +41,8 @@
static void
gsh_assign_updater(gsh_updater_data * item,
- void (*function) (gchar *, gpointer),
- gchar *command, GtkWidget *widget)
+ void (*function) (const gchar *, gpointer),
+ const gchar *command, GtkWidget *widget)
{
/* Assign the values to ITEM's members. */
@@ -55,10 +55,9 @@
}
void
-gsh_add_updater(
- struct GSH * gsh,
- void (*function) (gchar *, gpointer),
- gchar *command, GtkWidget *widget)
+gsh_add_updater(struct GSH * gsh,
+ void (*function) (const gchar *, gpointer),
+ const gchar *command, GtkWidget *widget)
{
gsh_updater_data *item;
Index: gtkshell/updated.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/updated.h 28 Feb 2007 03:53:51 -0000 1.6
+++ gtkshell/updated.h 2 Mar 2007 19:12:00 -0000 1.7
@@ -25,17 +25,17 @@
typedef struct
{
- void (*function) (gchar *, gpointer);
+ void (*function) (const gchar *, gpointer);
gchar *command;
GtkWidget *widget;
} gsh_updater_data;
void
gsh_add_updater(struct GSH * gsh,
- void (*function) (char *, gpointer),
- gchar *command, GtkWidget *widget);
+ void (*function) (const gchar *, gpointer),
+ const gchar *command, GtkWidget *widget);
void
- gsh_start_updates(struct GSH * gsh);
+gsh_start_updates(struct GSH * gsh);
#endif
Index: gtkshell/updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gtkshell/updated_label.c 2 Mar 2007 16:41:43 -0000 1.13
+++ gtkshell/updated_label.c 2 Mar 2007 19:12:00 -0000 1.14
@@ -41,9 +41,9 @@
}
static void
-gsh_update_label(char *command, gpointer widget)
+gsh_update_label(const gchar *command, gpointer widget)
{
- char *results;
+ gchar *results;
#ifdef DEBUG
ARBUG("gsh_update_label()");
@@ -52,10 +52,10 @@
ARPASSERT(command);
ARPASSERT(widget);
- results = antiright_pipe_read(command);
+ results = antiright_pipe_read((char *)command);
gsh_check_results(&results);
gsh_set_label((GtkWidget *) widget, results);
- free(results);
+ g_free(results);
}
void
@@ -70,6 +70,6 @@
ARPASSERT(gsh);
ARPASSERT(command);
- widget = gsh_add_label(gsh, command);
+ widget = gsh_add_label(gsh, (char *)command);
gsh_add_updater(gsh, &gsh_update_label, command, (gpointer) widget);
}
Index: gtkshell/updated_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_options.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/updated_options.c 2 Mar 2007 16:41:43 -0000 1.10
+++ gtkshell/updated_options.c 2 Mar 2007 19:12:00 -0000 1.11
@@ -45,8 +45,10 @@
add_updater(struct GSH * gsh, int argc, int * counter, char **argv,
void (*add_func)(struct GSH *, const gchar *))
{
+ ARBUG("enter add_updater");
+ (*add_func)(gsh, (const gchar *)argv[*counter+1]);
gsh_updater_argument_generic(gsh, argc, counter);
- (*add_func)(gsh, (const gchar *)argv[*counter + 1]);
+ ARBUG("leave add_updater");
}
void
@@ -62,7 +64,7 @@
break;
case 'p':
add_updater(gsh, argc, counter, argv,
- &gsh_add_updated_label);
+ &gsh_add_updated_progress);
break;
}
}
Index: gtkshell/updated_progress.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_progress.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/updated_progress.c 2 Mar 2007 16:41:43 -0000 1.8
+++ gtkshell/updated_progress.c 2 Mar 2007 19:12:00 -0000 1.9
@@ -23,14 +23,14 @@
#include "gtkshell.h"
static void
-gsh_update_progress(gchar *command, gpointer widget)
+gsh_update_progress(const gchar *command, gpointer widget)
{
gchar *results;
ARPASSERT(command);
ARPASSERT(widget);
- results = antiright_pipe_read(command);
+ results = antiright_pipe_read((char *)command);
ARPASSERT(results);
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR((GtkWidget *) widget),
strtod(results, NULL));
Index: libantiright/pipe.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/pipe.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libantiright/pipe.c 2 Mar 2007 03:56:07 -0000 1.6
+++ libantiright/pipe.c 2 Mar 2007 19:12:01 -0000 1.7
@@ -36,7 +36,7 @@
while((read = fread(buffer, sizeof(char), BUFSIZ, file)) != 0)
{
total += read;
- text = (gchar *) realloc(text, total*sizeof(char));
+ text = (gchar *) g_realloc(text, total*sizeof(char));
ARPASSERT(text);
g_strlcat(text, buffer, total);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright gtkshell/button.c gtkshell/callbacks....,
Jeffrey Bedard <=