10955N/A--- gcacltool-5.19.6/gcalctool/gtk.c 2007/07/22 06:13:02 1622

10955N/A+++ gcacltool-5.19.6/gcalctool/gtk.c 2007/07/24 14:31:01 1624

10955N/A@@ -91,7 +91,6 @@

10955N/A GConfClient *client;

10955N/A GtkUIManager *ui;

10955N/A GtkActionGroup *actions;

10955N/A- GtkTooltips *tips;

10955N/A GtkWidget *aframe; /* ASCII window. */

10955N/A GtkWidget *aframe_ch;

10955N/A GtkWidget *base[MAXBASES]; /* Numeric base radio buttons. */

10955N/A@@ -494,7 +493,6 @@

10955N/A gtk_rc_parse(g_build_path(v->home, RCNAME, NULL));

10955N/A

10955N/A X->kbd_accel = gtk_accel_group_new();

10955N/A- X->tips = gtk_tooltips_new();

10955N/A X->dpy = GDK_DISPLAY();

10955N/A

10955N/A gtk_window_set_default_icon_name("gnome-calculator");

10955N/A@@ -1713,7 +1711,7 @@

10955N/A

10955N/A for (i = 0; i < MAXTRIGMODES; i++) {

10955N/A X->trig[i] = gtk_radio_button_new_with_mnemonic(NULL, _(ttype_str[i]));

10955N/A- gtk_tooltips_set_tip(X->tips, X->trig[i], _(ttype_desc[i]), "");

10955N/A+ gtk_widget_set_tooltip_text (X->trig[i], _(ttype_desc[i]));

10955N/A g_object_set_data(G_OBJECT(X->trig[i]), "trig", GINT_TO_POINTER(i));

10955N/A gtk_widget_show(X->trig[i]);

10955N/A gtk_box_pack_start(GTK_BOX(trig_hbox), X->trig[i], FALSE, FALSE, 0);

10955N/A@@ -1734,7 +1732,7 @@

10955N/A

10955N/A for (i = 0; i < MAXBASES; i++) {

10955N/A X->base[i] = gtk_radio_button_new_with_mnemonic(NULL, _(base_str[i]));

10955N/A- gtk_tooltips_set_tip(X->tips, X->base[i], _(base_desc[i]), "");

10955N/A+ gtk_widget_set_tooltip_text (X->base[i], _(base_desc[i]));

10955N/A g_object_set_data(G_OBJECT(X->base[i]), "base", GINT_TO_POINTER(i));

10955N/A gtk_widget_show(X->base[i]);

10955N/A gtk_box_pack_start(GTK_BOX(base_hbox), X->base[i], FALSE, FALSE, 0);

10955N/A@@ -1751,7 +1749,7 @@

10955N/A /* Make Hyp and Inv trigonometric check boxes. */

10955N/A

10955N/A X->inv = gtk_check_button_new_with_mnemonic(_("_Inv"));

10955N/A- gtk_tooltips_set_tip(X->tips, X->inv, _(inv_desc), "");

10955N/A+ gtk_widget_set_tooltip_text (X->inv, _(inv_desc));

10955N/A gtk_widget_show(X->inv);

10955N/A gtk_box_pack_start(GTK_BOX(row2_hbox), X->inv, FALSE, FALSE, 0);

10955N/A access_object = gtk_widget_get_accessible(X->inv);

10955N/A@@ -1759,7 +1757,7 @@

10955N/A g_signal_connect(G_OBJECT(X->inv), "toggled", G_CALLBACK(inv_cb), NULL);

10955N/A

10955N/A X->hyp = gtk_check_button_new_with_mnemonic(_("H_yp"));

10955N/A- gtk_tooltips_set_tip(X->tips, X->hyp, _(hyp_desc), "");

10955N/A+ gtk_widget_set_tooltip_text (X->hyp, _(hyp_desc));

10955N/A gtk_widget_show(X->hyp);

10955N/A gtk_box_pack_start(GTK_BOX(row2_hbox), X->hyp, FALSE, FALSE, 0);

10955N/A access_object = gtk_widget_get_accessible(X->hyp);

10955N/A@@ -1773,7 +1771,7 @@

10955N/A

10955N/A for (i = 0; i < MAXTRIGMODES; i++) {

10955N/A X->disp[i] = gtk_radio_button_new_with_mnemonic(NULL, _(dtype_str[i]));

10955N/A- gtk_tooltips_set_tip(X->tips, X->disp[i], _(dtype_desc[i]), "");

10955N/A+ gtk_widget_set_tooltip_text (X->disp[i], _(dtype_desc[i]));

10955N/A g_object_set_data(G_OBJECT(X->disp[i]), "disp", GINT_TO_POINTER(i));

10955N/A gtk_widget_show(X->disp[i]);

10955N/A gtk_box_pack_start(GTK_BOX(disp_hbox), X->disp[i], FALSE, FALSE, 0);

10955N/A@@ -2431,7 +2429,7 @@

10955N/A snprintf(tooltip, MAXLINE,

10955N/A _("Set accuracy from 0 to %d numeric places. Currently set to %d places. [a]"),

10955N/A MAXACC, accuracy);

10955N/A- gtk_tooltips_set_tip(X->tips, BUT_ACC, tooltip, "");

10955N/A+ gtk_widget_set_tooltip_text (BUT_ACC, tooltip);

10955N/A }

10955N/A

10955N/A

10955N/A@@ -2501,8 +2499,7 @@

10955N/A SNPRINTF(name, MAXLINE, "%s_button%1d", tag, n);

10955N/A gtk_widget_set_name(Gtk_buttons[n], name);

10955N/A if (buttons[n].hstr != NULL) {

10955N/A- gtk_tooltips_set_tip(X->tips, Gtk_buttons[n],

10955N/A- _(buttons[n].hstr), "");

10955N/A+ gtk_widget_set_tooltip_text (Gtk_buttons[n],_(buttons[n].hstr));

10955N/A }

10955N/A g_object_set_data(G_OBJECT(Gtk_buttons[n]),

10955N/A "button", &buttons[n]);

18580N/Adiff -ruN gcalctool-5.30.0.orig/src/gcalccmd.c gcalctool-5.30.0/src/gcalccmd.c

18580N/A--- gcalctool-5.30.0.orig/src/gcalccmd.c 2010-04-12 19:36:47.448967764 +0100

18580N/A+++ gcalctool-5.30.0/src/gcalccmd.c 2010-04-12 19:37:18.126222836 +0100

18580N/A@@ -82,7 +82,8 @@

18580N/A while (1) {

18580N/A printf("> ");

18580N/A equation = (char *) malloc(MAXLINE * sizeof(char));

18580N/A- bytes_read = getline(&equation, &nbytes, stdin);

18580N/A+ #bytes_read = getline(&equation, &nbytes, stdin);

18580N/A+ bytes_read = fgets(&equation, &nbytes, stdin);

18580N/A

18580N/A if (bytes_read != -1) {

18580N/A str_adjust(equation);