[Antiright-devel] antiright gshterm/gshterm.c gtkshell/button.c

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/26 19:50:07

Modified files:
        gshterm        : gshterm.c 
        gtkshell       : button.c 

Log message:
        Split out label setting code.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gshterm/gshterm.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.12&r2=1.13

Patches:
Index: gshterm/gshterm.c
===================================================================
RCS file: /sources/antiright/antiright/gshterm/gshterm.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gshterm/gshterm.c   26 Feb 2007 19:38:39 -0000      1.9
+++ gshterm/gshterm.c   26 Feb 2007 19:50:07 -0000      1.10
@@ -31,10 +31,15 @@
                ar_asprintf(&final_font, "Mono 12");
        else
        {
-               if(term->font_size == 0) /* Default font size.  */
-                       term->font_size=12;
+               if(term->font_size == 0)
+                       /* If size is unspecified, then either the user
+                        * may have specified a font size as part of the
+                        * font string, or we will rely on system defaults. */
+                       ar_asprintf(&final_font, "%s", term->font);
+               else
+                       ar_asprintf(&final_font, "%s %d", term->font, 
+                                       term->font_size);
 
-               ar_asprintf(&final_font, "%s %d", term->font, term->font_size);
                g_free(term->font);
                term->font=NULL;
        }

Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gtkshell/button.c   24 Feb 2007 08:49:27 -0000      1.12
+++ gtkshell/button.c   26 Feb 2007 19:50:07 -0000      1.13
@@ -21,6 +21,18 @@
 */
 
 #include "gtkshell.h"
+
+static void
+setup_label(GtkWidget *widget, char *command);
+
+static void
+setup_label(GtkWidget *widget, char *command)
+{
+       gchar * formatted;
+       formatted=antiright_beautified_label(command);
+       gtk_button_set_label(GTK_BUTTON(widget), formatted);
+       free(formatted);
+}
 void
 gsh_command_button (struct GSH * gsh, char *command)
 {
@@ -33,14 +45,16 @@
 
   /* 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.  */
 
-  label_text = antiright_beautified_label (command);
-  gsh->button = gtk_button_new_with_label (label_text);
-  g_free (label_text);
+       gsh->button = gtk_button_new ();
+
+       setup_label(gsh->button, command);
 
        gsh_setup_drag_drop(gsh->button);