[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: CVS update: s_toplevel.c
User: ahvezda
Date: 07/04/28 10:03:14
Modified: . s_toplevel.c x_dialog.c x_fileselect.c
Log:
Removed gettext.h header file and the few _( ) pairs to get rid of
some warnings. gattrib does not use gettext.
Revision Changes Path
1.28 +3 -5 eda/geda/gaf/gattrib/src/s_toplevel.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: s_toplevel.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gattrib/src/s_toplevel.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- s_toplevel.c 17 Apr 2007 20:19:13 -0000 1.27
+++ s_toplevel.c 28 Apr 2007 14:03:14 -0000 1.28
@@ -1,4 +1,4 @@
-/* $Id: s_toplevel.c,v 1.27 2007/04/17 20:19:13 pcjc2 Exp $ */
+/* $Id: s_toplevel.c,v 1.28 2007/04/28 14:03:14 ahvezda Exp $ */
/* gEDA - GPL Electronic Design Automation
* gattrib -- gEDA component and net attribute manipulation using spreadsheet.
@@ -724,8 +724,6 @@
gint visibility = 0;
gint show_name_value = 0;
- gint status;
-
#if DEBUG
printf("----- Entering s_toplevel_update_component_attribs_in_toplevel.\n");
#endif
@@ -759,6 +757,8 @@
s_string_list_add_item(complete_comp_attrib_list, &count, old_name_value_pair);
}
#else
+ /* might now compile now, but this #if'd out branch isn't being built */
+ gint status;
status = o_attrib_get_name_value(old_name_value_pair, &old_attrib_name, &old_attrib_value);
if (status == 0) {
/* Don't put "refdes" or "slot" into list. Don't put old name=value pair into list if a new
@@ -1046,8 +1046,6 @@
char *new_attrib_value;
char *old_attrib_value;
- gint status;
-
#if DEBUG
printf("----- Entering s_toplevel_update_pin_attribs_in_toplevel.\n");
#endif
1.27 +12 -12 eda/geda/gaf/gattrib/src/x_dialog.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_dialog.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gattrib/src/x_dialog.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- x_dialog.c 21 Apr 2007 20:33:52 -0000 1.26
+++ x_dialog.c 28 Apr 2007 14:03:14 -0000 1.27
@@ -1,4 +1,4 @@
-/* $Id: x_dialog.c,v 1.26 2007/04/21 20:33:52 pcjc2 Exp $ */
+/* $Id: x_dialog.c,v 1.27 2007/04/28 14:03:14 ahvezda Exp $ */
/* gEDA - GPL Electronic Design Automation
* gattrib -- gEDA component and net attribute manipulation using spreadsheet.
@@ -99,7 +99,7 @@
gtk_window_set_modal(GTK_WINDOW(newattrib_window), TRUE);
/* Create a text label for the dialog window */
- label = gtk_label_new (_("Enter new attribute name"));
+ label = gtk_label_new ("Enter new attribute name");
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX(vbox), label, FALSE, FALSE, 0);
gtk_widget_set_size_request (label, 127, 50);
@@ -274,7 +274,7 @@
gtk_window_set_modal(GTK_WINDOW(delattrib_window), TRUE);
/* Create a text label for the dialog window */
- label = gtk_label_new (_("Are you sure you want to delete this attribute?"));
+ label = gtk_label_new ("Are you sure you want to delete this attribute?");
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX(vbox), label, FALSE, FALSE, 0);
gtk_widget_set_size_request (label, 127, 50);
@@ -416,17 +416,17 @@
/* Create a text label for the dialog window */
string =
- g_strdup_printf(_("Warning! One or more components have been found with missing symbol files!\n"));
+ g_strdup_printf("Warning! One or more components have been found with missing symbol files!\n");
string =
- g_strdup_printf(_("%s\n"), string);
+ g_strdup_printf("%s\n", string);
string =
- g_strdup_printf(_("%sThis probably happened because gattrib couldn't find your component libraries,\n"), string);
+ g_strdup_printf("%sThis probably happened because gattrib couldn't find your component libraries,\n", string);
string =
- g_strdup_printf(_("%sperhaps because your gafrc or gattribrc files are misconfigured.\n"), string);
+ g_strdup_printf("%sperhaps because your gafrc or gattribrc files are misconfigured.\n", string);
string =
- g_strdup_printf(_("%sChose \"Quit\" to leave gattrib and fix the problem, or\n"), string);
+ g_strdup_printf("%sChose \"Quit\" to leave gattrib and fix the problem, or\n", string);
string =
- g_strdup_printf(_("%s\"Forward\" to continue working with gattrib.\n"), string);
+ g_strdup_printf("%s\"Forward\" to continue working with gattrib.\n", string);
label = gtk_label_new(string);
gtk_widget_show (label);
@@ -556,11 +556,11 @@
/* Create a text label for the dialog window */
string =
- g_strdup_printf(_("Warning! You have unsaved data in the spreadsheet!\n"));
+ g_strdup_printf("Warning! You have unsaved data in the spreadsheet!\n");
string =
- g_strdup_printf(_("%sAre you sure you want to quit? Click \"Quit\" to\n"), string);
+ g_strdup_printf("%sAre you sure you want to quit? Click \"Quit\" to\n", string);
string =
- g_strdup_printf(_("%squit anyway, or \"Stop\" to go back and save you work.\n"), string);
+ g_strdup_printf("%squit anyway, or \"Stop\" to go back and save you work.\n", string);
label = gtk_label_new(string);
gtk_widget_show (label);
1.17 +8 -8 eda/geda/gaf/gattrib/src/x_fileselect.c
(In the diff below, changes in quantity of whitespace are not shown.)
Index: x_fileselect.c
===================================================================
RCS file: /home/cvspsrv/cvsroot/eda/geda/gaf/gattrib/src/x_fileselect.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- x_fileselect.c 21 Apr 2007 18:59:06 -0000 1.16
+++ x_fileselect.c 28 Apr 2007 14:03:14 -0000 1.17
@@ -137,23 +137,23 @@
/* file filter for schematic files (*.sch) */
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Schematics"));
+ gtk_file_filter_set_name (filter, "Schematics");
gtk_file_filter_add_pattern (filter, "*.sch");
gtk_file_chooser_add_filter (filechooser, filter);
/* file filter for symbol files (*.sym) */
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Symbols"));
+ gtk_file_filter_set_name (filter, "Symbols");
gtk_file_filter_add_pattern (filter, "*.sym");
gtk_file_chooser_add_filter (filechooser, filter);
/* file filter for both symbol and schematic files (*.sym+*.sch) */
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Schematics and symbols"));
+ gtk_file_filter_set_name (filter, "Schematics and symbols");
gtk_file_filter_add_pattern (filter, "*.sym");
gtk_file_filter_add_pattern (filter, "*.sch");
gtk_file_chooser_add_filter (filechooser, filter);
/* file filter that match any file */
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("All files"));
+ gtk_file_filter_set_name (filter, "All files");
gtk_file_filter_add_pattern (filter, "*");
gtk_file_chooser_add_filter (filechooser, filter);
@@ -301,7 +301,7 @@
{
GtkWidget *dialog;
- dialog = gtk_file_chooser_dialog_new (_("Open..."),
+ dialog = gtk_file_chooser_dialog_new ("Open...",
GTK_WINDOW(window),
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -356,7 +356,7 @@
{
GtkWidget *dialog;
- dialog = gtk_file_chooser_dialog_new (_("Save as..."),
+ dialog = gtk_file_chooser_dialog_new ("Save as...",
GTK_WINDOW(window),
GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -387,7 +387,7 @@
/* try saving current page of toplevel to file filename */
if (filename != NULL &&
f_save (pr_current, filename)) {
- s_log_message (_("Saved As [%s]\n"), filename);
+ s_log_message ("Saved As [%s]\n", filename);
/* Update filename for "saveas" operation */
x_fileselect_set_filename (pr_current, filename);
@@ -401,7 +401,7 @@
} else {
/* report error in log and status bar */
- s_log_message (_("Could NOT save [%s]\n"),
+ s_log_message ("Could NOT save [%s]\n",
pr_current->page_current->page_filename);
g_free (filename);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs