deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-12 16:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix building as c89

Browse Source
This commit is contained in:
TingPing
2014-12-17 18:49:59 -05:00
parent 3f855f07f5
commit 95febd978c
45 changed files with 347 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/fe-gtk/chanlist.c
View File

@@ -94,7 +94,7 @@ chanlist_update_caption (server *serv)
{
gchar tbuf[256];
snprintf (tbuf, sizeof tbuf,
g_snprintf (tbuf, sizeof tbuf,
_("Displaying %d/%d users on %d/%d channels."),
serv->gui->chanlist_users_shown_count,
serv->gui->chanlist_users_found_count,
@@ -456,7 +456,7 @@ chanlist_join (GtkWidget * wid, server *serv)
{
if (serv->connected && (strcmp (chan, "*") != 0))
{
snprintf (tbuf, sizeof (tbuf), "join %s", chan);
g_snprintf (tbuf, sizeof (tbuf), "join %s", chan);
handle_command (serv->server_session, tbuf, FALSE);
} else
gdk_beep ();
@@ -482,7 +482,7 @@ chanlist_filereq_done (server *serv, char *file)
if (fh == -1)
return;
snprintf (buf, sizeof buf, "HexChat Channel List: %s - %s\n",
g_snprintf (buf, sizeof buf, "HexChat Channel List: %s - %s\n",
serv->servername, ctime (&t));
write (fh, buf, strlen (buf));
@@ -494,7 +494,7 @@ chanlist_filereq_done (server *serv, char *file)
COL_CHANNEL, &chan,
COL_USERS, &users,
COL_TOPIC, &topic, -1);
snprintf (buf, sizeof buf, "%-16s %-5d%s\n", chan, users, topic);
g_snprintf (buf, sizeof buf, "%-16s %-5d%s\n", chan, users, topic);
g_free (chan);
g_free (topic);
write (fh, buf, strlen (buf));
@@ -717,7 +717,7 @@ chanlist_opengui (server *serv, int do_refresh)
return;
}
snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Channel List (%s)"),
g_snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Channel List (%s)"),
server_get_network (serv, TRUE));
serv->gui->chanlist_pending_rows = NULL;

20
src/fe-gtk/dccgui.c
View File

@@ -194,12 +194,12 @@ dcc_prepare_row_send (struct DCC *dcc, GtkListStore *store, GtkTreeIter *iter,
per = (float) ((dcc->ack * 100.00) / dcc->size);
proper_unit (dcc->size, size, sizeof (size));
proper_unit (dcc->pos, pos, sizeof (pos));
snprintf (kbs, sizeof (kbs), "%.1f", ((float)dcc->cps) / 1024);
snprintf (perc, sizeof (perc), "%.0f%%", per);
g_snprintf (kbs, sizeof (kbs), "%.1f", ((float)dcc->cps) / 1024);
g_snprintf (perc, sizeof (perc), "%.0f%%", per);
if (dcc->cps != 0)
{
to_go = (dcc->size - dcc->ack) / dcc->cps;
snprintf (eta, sizeof (eta), "%.2d:%.2d:%.2d",
g_snprintf (eta, sizeof (eta), "%.2d:%.2d:%.2d",
to_go / 3600, (to_go / 60) % 60, to_go % 60);
} else
strcpy (eta, "--:--:--");
@@ -252,14 +252,14 @@ dcc_prepare_row_recv (struct DCC *dcc, GtkListStore *store, GtkTreeIter *iter,
proper_unit (dcc->resumable, pos, sizeof (pos));
else
proper_unit (dcc->pos, pos, sizeof (pos));
snprintf (kbs, sizeof (kbs), "%.1f", ((float)dcc->cps) / 1024);
g_snprintf (kbs, sizeof (kbs), "%.1f", ((float)dcc->cps) / 1024);
/* percentage recv'ed */
per = (float) ((dcc->pos * 100.00) / dcc->size);
snprintf (perc, sizeof (perc), "%.0f%%", per);
g_snprintf (perc, sizeof (perc), "%.0f%%", per);
if (dcc->cps != 0)
{
to_go = (dcc->size - dcc->pos) / dcc->cps;
snprintf (eta, sizeof (eta), "%.2d:%.2d:%.2d",
g_snprintf (eta, sizeof (eta), "%.2d:%.2d:%.2d",
to_go / 3600, (to_go / 60) % 60, to_go % 60);
} else
strcpy (eta, "--:--:--");
@@ -525,7 +525,7 @@ resume_clicked (GtkWidget * wid, gpointer none)
fe_message (_("That file is not resumable."), FE_MSG_ERROR);
break;
case 1:
snprintf (buf, sizeof (buf),
g_snprintf (buf, sizeof (buf),
_( "Cannot access file: %s\n"
"%s.\n"
"Resuming not possible."), dcc->destfile,
@@ -606,7 +606,7 @@ browse_folder (char *dir)
#else
char buf[512];
snprintf (buf, sizeof (buf), "file://%s", dir);
g_snprintf (buf, sizeof (buf), "file://%s", dir);
fe_open_url (buf);
#endif
}
@@ -639,7 +639,7 @@ dcc_details_populate (struct DCC *dcc)
gtk_label_set_text (GTK_LABEL (dccfwin.file_label), dcc->file);
/* address and port */
snprintf (buf, sizeof (buf), "%s : %d", net_ip (dcc->addr), dcc->port);
g_snprintf (buf, sizeof (buf), "%s : %d", net_ip (dcc->addr), dcc->port);
gtk_label_set_text (GTK_LABEL (dccfwin.address_label), buf);
}
@@ -737,7 +737,7 @@ dcc_detail_label (char *text, GtkWidget *box, int num)
char buf[64];
label = gtk_label_new (NULL);
snprintf (buf, sizeof (buf), "<b>%s</b>", text);
g_snprintf (buf, sizeof (buf), "<b>%s</b>", text);
gtk_label_set_markup (GTK_LABEL (label), buf);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
gtk_table_attach (GTK_TABLE (box), label, 0, 1, 0 + num, 1 + num, GTK_FILL, GTK_FILL, 0, 0);

10
src/fe-gtk/fe-gtk.c
View File

@@ -265,7 +265,7 @@ create_input_style (GtkStyle *style)
/* fall back */
if (pango_font_description_get_size (style->font_desc) == 0)
{
snprintf (buf, sizeof (buf), _("Failed to open font:\n\n%s"), prefs.hex_text_font);
g_snprintf (buf, sizeof (buf), _("Failed to open font:\n\n%s"), prefs.hex_text_font);
fe_message (buf, FE_MSG_ERROR);
pango_font_description_free (style->font_desc);
style->font_desc = pango_font_description_from_string ("sans 11");
@@ -746,9 +746,9 @@ fe_set_lag (server *serv, long lag)
if (per > 1.0)
per = 1.0;
snprintf (lagtext, sizeof (lagtext) - 1, "%s%ld.%lds",
g_snprintf (lagtext, sizeof (lagtext) - 1, "%s%ld.%lds",
serv->lag_sent ? "+" : "", lag / 1000, (lag/100) % 10);
snprintf (lagtip, sizeof (lagtip) - 1, "Lag: %s%ld.%ld seconds",
g_snprintf (lagtip, sizeof (lagtip) - 1, "Lag: %s%ld.%ld seconds",
serv->lag_sent ? "+" : "", lag / 1000, (lag/100) % 10);
while (list)
@@ -797,8 +797,8 @@ fe_set_throttle (server *serv)
sess = list->data;
if (sess->server == serv)
{
snprintf (tbuf, sizeof (tbuf) - 1, _("%d bytes"), serv->sendq_len);
snprintf (tip, sizeof (tip) - 1, _("Network send queue: %d bytes"), serv->sendq_len);
g_snprintf (tbuf, sizeof (tbuf) - 1, _("%d bytes"), serv->sendq_len);
g_snprintf (tip, sizeof (tip) - 1, _("Network send queue: %d bytes"), serv->sendq_len);
g_free (sess->res->queue_tip);
sess->res->queue_tip = g_strdup (tip);

12
src/fe-gtk/fkeys.c
View File

@@ -849,7 +849,7 @@ key_save_kbs (void)
0x180, XOF_DOMODE);
if (fd < 0)
return 1;
write (fd, buf, snprintf (buf, 510, "# HexChat key bindings config file\n\n"));
write (fd, buf, g_snprintf (buf, 510, "# HexChat key bindings config file\n\n"));
while (list)
{
@@ -857,17 +857,17 @@ key_save_kbs (void)
accel_text = gtk_accelerator_name (kb->keyval, kb->mod);
snprintf (buf, 510, "ACCEL=%s\n%s\n", accel_text, key_actions[kb->action].name);
g_snprintf (buf, 510, "ACCEL=%s\n%s\n", accel_text, key_actions[kb->action].name);
write (fd, buf, strlen (buf));
g_free (accel_text);
if (kb->data1 && kb->data1[0])
write (fd, buf, snprintf (buf, 510, "D1:%s\n", kb->data1));
write (fd, buf, g_snprintf (buf, 510, "D1:%s\n", kb->data1));
else
write (fd, "D1!\n", 4);
if (kb->data2 && kb->data2[0])
write (fd, buf, snprintf (buf, 510, "D2:%s\n", kb->data2));
write (fd, buf, g_snprintf (buf, 510, "D2:%s\n", kb->data2));
else
write (fd, "D2!\n", 4);
@@ -1813,9 +1813,9 @@ replace_handle (GtkWidget *t)
memcpy (outbuf, text, xlen);
outbuf[xlen] = 0;
if (postfix_pnt == NULL)
snprintf (word, sizeof (word), "%s", pop->cmd);
g_snprintf (word, sizeof (word), "%s", pop->cmd);
else
snprintf (word, sizeof (word), "%s%s", pop->cmd, postfix);
g_snprintf (word, sizeof (word), "%s%s", pop->cmd, postfix);
g_strlcat (outbuf, word, sizeof(outbuf));
SPELL_ENTRY_SET_TEXT (t, outbuf);
SPELL_ENTRY_SET_POS (t, -1);

8
src/fe-gtk/joind.c
View File

@@ -158,9 +158,9 @@ joind_show_dialog (server *serv)
gtk_widget_show (vbox2);
gtk_box_pack_start (GTK_BOX (hbox1), vbox2, TRUE, TRUE, 0);
snprintf (buf2, sizeof (buf2), _("Connection to %s complete."),
g_snprintf (buf2, sizeof (buf2), _("Connection to %s complete."),
server_get_network (serv, TRUE));
snprintf (buf, sizeof (buf), "\n<b>%s</b>", buf2);
g_snprintf (buf, sizeof (buf), "\n<b>%s</b>", buf2);
label = gtk_label_new (buf);
gtk_widget_show (label);
gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
@@ -198,7 +198,7 @@ joind_show_dialog (server *serv)
gtk_widget_show (entry1);
gtk_box_pack_start (GTK_BOX (hbox2), entry1, TRUE, TRUE, 8);
snprintf (buf, sizeof (buf), "<small> %s</small>",
g_snprintf (buf, sizeof (buf), "<small> %s</small>",
_("If you know the name of the channel you want to join, enter it here."));
label = gtk_label_new (buf);
gtk_widget_show (label);
@@ -212,7 +212,7 @@ joind_show_dialog (server *serv)
gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton3), radiobutton1_group);
radiobutton1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton3));
snprintf (buf, sizeof (buf), "<small> %s</small>",
g_snprintf (buf, sizeof (buf), "<small> %s</small>",
_("Retrieving the Channel-List may take a minute or two."));
label = gtk_label_new (buf);
gtk_widget_show (label);

26
src/fe-gtk/maingui.c
View File

@@ -393,42 +393,42 @@ fe_set_title (session *sess)
switch (type)
{
case SESS_DIALOG:
snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s %s @ %s",
g_snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s %s @ %s",
_("Dialog with"), sess->channel, server_get_network (sess->server, TRUE));
break;
case SESS_SERVER:
snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s @ %s",
g_snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s @ %s",
sess->server->nick, server_get_network (sess->server, TRUE));
break;
case SESS_CHANNEL:
/* don't display keys in the titlebar */
if (prefs.hex_gui_win_modes)
{
snprintf (tbuf, sizeof (tbuf),
g_snprintf (tbuf, sizeof (tbuf),
DISPLAY_NAME": %s @ %s / %s (%s)",
sess->server->nick, server_get_network (sess->server, TRUE),
sess->channel, sess->current_modes ? sess->current_modes : "");
}
else
{
snprintf (tbuf, sizeof (tbuf),
g_snprintf (tbuf, sizeof (tbuf),
DISPLAY_NAME": %s @ %s / %s",
sess->server->nick, server_get_network (sess->server, TRUE),
sess->channel);
}
if (prefs.hex_gui_win_ucount)
{
snprintf (tbuf + strlen (tbuf), 9, " (%d)", sess->total);
g_snprintf (tbuf + strlen (tbuf), 9, " (%d)", sess->total);
}
break;
case SESS_NOTICES:
case SESS_SNOTICES:
snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s @ %s (notices)",
g_snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME": %s @ %s (notices)",
sess->server->nick, server_get_network (sess->server, TRUE));
break;
default:
def:
snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME);
g_snprintf (tbuf, sizeof (tbuf), DISPLAY_NAME);
gtk_window_set_title (GTK_WINDOW (sess->gui->window), tbuf);
return;
}
@@ -1567,7 +1567,7 @@ mg_create_tabmenu (session *sess, GdkEventButton *event, chan *ch)
if (sess)
{
char *name = g_markup_escape_text (sess->channel[0] ? sess->channel : _("<none>"), -1);
snprintf (buf, sizeof (buf), "<span foreground=\"#3344cc\"><b>%s</b></span>", name);
g_snprintf (buf, sizeof (buf), "<span foreground=\"#3344cc\"><b>%s</b></span>", name);
g_free (name);
item = gtk_menu_item_new_with_label ("");
@@ -1940,7 +1940,7 @@ flagl_hit (GtkWidget * wid, struct session *sess)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wid), FALSE);
return;
}
snprintf (modes, sizeof (modes), "+l %d", atoi (limit_str));
g_snprintf (modes, sizeof (modes), "+l %d", atoi (limit_str));
serv->p_mode (serv, sess->channel, modes);
serv->p_join_info (serv, sess->channel);
}
@@ -1956,7 +1956,7 @@ flagk_hit (GtkWidget * wid, struct session *sess)
if (serv->connected && sess->channel[0])
{
snprintf (modes, sizeof (modes), "-k %s",
g_snprintf (modes, sizeof (modes), "-k %s",
gtk_entry_get_text (GTK_ENTRY (sess->gui->key_entry)));
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (wid)))
@@ -2022,7 +2022,7 @@ mg_key_entry_cb (GtkWidget * igad, gpointer userdata)
if (serv->connected && sess->channel[0])
{
snprintf (modes, sizeof (modes), "+k %s",
g_snprintf (modes, sizeof (modes), "+k %s",
gtk_entry_get_text (GTK_ENTRY (igad)));
serv->p_mode (serv, sess->channel, modes);
serv->p_join_info (serv, sess->channel);
@@ -2045,7 +2045,7 @@ mg_limit_entry_cb (GtkWidget * igad, gpointer userdata)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sess->gui->flag_l), FALSE);
return;
}
snprintf (modes, sizeof(modes), "+l %d",
g_snprintf (modes, sizeof(modes), "+l %d",
atoi (gtk_entry_get_text (GTK_ENTRY (igad))));
serv->p_mode (serv, sess->channel, modes);
serv->p_join_info (serv, sess->channel);
@@ -2596,7 +2596,7 @@ mg_change_nick (int cancel, char *text, gpointer userdata)
if (!cancel)
{
snprintf (buf, sizeof (buf), "nick %s", text);
g_snprintf (buf, sizeof (buf), "nick %s", text);
handle_command (current_sess, buf, FALSE);
}
}

38
src/fe-gtk/menu.c
View File

@@ -393,9 +393,9 @@ toggle_cb (GtkWidget *item, char *pref_name)
char buf[256];
if (GTK_CHECK_MENU_ITEM (item)->active)
snprintf (buf, sizeof (buf), "set %s 1", pref_name);
g_snprintf (buf, sizeof (buf), "set %s 1", pref_name);
else
snprintf (buf, sizeof (buf), "set %s 0", pref_name);
g_snprintf (buf, sizeof (buf), "set %s 0", pref_name);
handle_command (current_sess, buf, FALSE);
}
@@ -586,7 +586,7 @@ menu_nickinfo_cb (GtkWidget *menu, session *sess)
return;
/* issue a /WHOIS */
snprintf (buf, sizeof (buf), "WHOIS %s %s", str_copy, str_copy);
g_snprintf (buf, sizeof (buf), "WHOIS %s %s", str_copy, str_copy);
handle_command (sess, buf, FALSE);
/* and hide the output */
sess->server->skip_next_whois = 1;
@@ -612,30 +612,30 @@ menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
/* let the translators tweak this if need be */
fmt = _("<tt><b>%-11s</b></tt> %s");
snprintf (unknown, sizeof (unknown), "<i>%s</i>", _("Unknown"));
g_snprintf (unknown, sizeof (unknown), "<i>%s</i>", _("Unknown"));
if (user->realname)
{
real = strip_color (user->realname, -1, STRIP_ALL|STRIP_ESCMARKUP);
snprintf (buf, sizeof (buf), fmt, _("Real Name:"), real);
g_snprintf (buf, sizeof (buf), fmt, _("Real Name:"), real);
g_free (real);
} else
{
snprintf (buf, sizeof (buf), fmt, _("Real Name:"), unknown);
g_snprintf (buf, sizeof (buf), fmt, _("Real Name:"), unknown);
}
item = menu_quick_item (0, buf, submenu, XCMENU_MARKUP, 0, 0);
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (copy_to_clipboard_cb),
user->realname ? user->realname : unknown);
snprintf (buf, sizeof (buf), fmt, _("User:"),
g_snprintf (buf, sizeof (buf), fmt, _("User:"),
user->hostname ? user->hostname : unknown);
item = menu_quick_item (0, buf, submenu, XCMENU_MARKUP, 0, 0);
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (copy_to_clipboard_cb),
user->hostname ? user->hostname : unknown);
snprintf (buf, sizeof (buf), fmt, _("Account:"),
g_snprintf (buf, sizeof (buf), fmt, _("Account:"),
user->account ? user->account : unknown);
item = menu_quick_item (0, buf, submenu, XCMENU_MARKUP, 0, 0);
g_signal_connect (G_OBJECT (item), "activate",
@@ -645,13 +645,13 @@ menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
users_country = country (user->hostname);
if (users_country)
{
snprintf (buf, sizeof (buf), fmt, _ ("Country:"), users_country);
g_snprintf (buf, sizeof (buf), fmt, _ ("Country:"), users_country);
item = menu_quick_item (0, buf, submenu, XCMENU_MARKUP, 0, 0);
g_signal_connect (G_OBJECT (item), "activate",
G_CALLBACK (copy_to_clipboard_cb), users_country);
}
snprintf (buf, sizeof (buf), fmt, _("Server:"),
g_snprintf (buf, sizeof (buf), fmt, _("Server:"),
user->servername ? user->servername : unknown);
item = menu_quick_item (0, buf, submenu, XCMENU_MARKUP, 0, 0);
g_signal_connect (G_OBJECT (item), "activate",
@@ -662,12 +662,12 @@ menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
{
char min[96];
snprintf (min, sizeof (min), _("%u minutes ago"),
g_snprintf (min, sizeof (min), _("%u minutes ago"),
(unsigned int) ((time (0) - user->lasttalk) / 60));
snprintf (buf, sizeof (buf), fmt, _("Last Msg:"), min);
g_snprintf (buf, sizeof (buf), fmt, _("Last Msg:"), min);
} else
{
snprintf (buf, sizeof (buf), fmt, _("Last Msg:"), unknown);
g_snprintf (buf, sizeof (buf), fmt, _("Last Msg:"), unknown);
}
menu_quick_item (0, buf, submenu, XCMENU_MARKUP, 0, 0);
@@ -677,7 +677,7 @@ menu_create_nickinfo_menu (struct User *user, GtkWidget *submenu)
if (away)
{
char *msg = strip_color (away->message ? away->message : unknown, -1, STRIP_ALL|STRIP_ESCMARKUP);
snprintf (buf, sizeof (buf), fmt, _("Away Msg:"), msg);
g_snprintf (buf, sizeof (buf), fmt, _("Away Msg:"), msg);
g_free (msg);
item = menu_quick_item (0, buf, submenu, XCMENU_MARKUP, 0, 0);
g_signal_connect (G_OBJECT (item), "activate",
@@ -734,7 +734,7 @@ menu_nickmenu (session *sess, GdkEventButton *event, char *nick, int num_sel)
/* more than 1 nick selected? */
if (num_sel > 1)
{
snprintf (buf, sizeof (buf), _("%d nicks selected."), num_sel);
g_snprintf (buf, sizeof (buf), _("%d nicks selected."), num_sel);
menu_quick_item (0, buf, menu, 0, 0, 0);
menu_quick_item (0, 0, menu, XCMENU_SHADED, 0, 0);
} else
@@ -935,7 +935,7 @@ open_url_cb (GtkWidget *item, char *url)
char buf[512];
/* pass this to /URL so it can handle irc:// */
snprintf (buf, sizeof (buf), "URL %s", url);
g_snprintf (buf, sizeof (buf), "URL %s", url);
handle_command (current_sess, buf, FALSE);
}
@@ -984,7 +984,7 @@ menu_chan_cycle (GtkWidget * menu, char *chan)
if (current_sess)
{
snprintf (tbuf, sizeof tbuf, "CYCLE %s", chan);
g_snprintf (tbuf, sizeof tbuf, "CYCLE %s", chan);
handle_command (current_sess, tbuf, FALSE);
}
}
@@ -996,7 +996,7 @@ menu_chan_part (GtkWidget * menu, char *chan)
if (current_sess)
{
snprintf (tbuf, sizeof tbuf, "part %s", chan);
g_snprintf (tbuf, sizeof tbuf, "part %s", chan);
handle_command (current_sess, tbuf, FALSE);
}
}
@@ -1008,7 +1008,7 @@ menu_chan_join (GtkWidget * menu, char *chan)
if (current_sess)
{
snprintf (tbuf, sizeof tbuf, "join %s", chan);
g_snprintf (tbuf, sizeof tbuf, "join %s", chan);
handle_command (current_sess, tbuf, FALSE);
}
}

10
src/fe-gtk/notifygui.c
View File

@@ -190,11 +190,11 @@ notify_gui_update (void)
{
lastseenminutes = (int)(time (0) - lastseen) / 60;
if (lastseenminutes < 60)
snprintf (agobuf, sizeof (agobuf), _("%d minutes ago"), lastseenminutes);
g_snprintf (agobuf, sizeof (agobuf), _("%d minutes ago"), lastseenminutes);
else if (lastseenminutes < 120)
snprintf (agobuf, sizeof (agobuf), _("An hour ago"));
g_snprintf (agobuf, sizeof (agobuf), _("An hour ago"));
else
snprintf (agobuf, sizeof (agobuf), _("%d hours ago"), lastseenminutes / 60);
g_snprintf (agobuf, sizeof (agobuf), _("%d hours ago"), lastseenminutes / 60);
seen = agobuf;
}
if (!valid) /* create new tree row if required */
@@ -219,7 +219,7 @@ notify_gui_update (void)
name = "";
server = server_get_network (servnot->server, TRUE);
snprintf (agobuf, sizeof (agobuf), _("%d minutes ago"), (int)(time (0) - lastseen) / 60);
g_snprintf (agobuf, sizeof (agobuf), _("%d minutes ago"), (int)(time (0) - lastseen) / 60);
seen = agobuf;
if (!valid) /* create new tree row if required */
@@ -380,7 +380,7 @@ fe_notify_ask (char *nick, char *networks)
gtk_table_attach_defaults (GTK_TABLE (table), wid, 1, 2, 2, 3);
label = gtk_label_new (NULL);
snprintf (buf, sizeof (buf), "<i><span size=\"smaller\">%s</span></i>", _("Comma separated list of networks is accepted."));
g_snprintf (buf, sizeof (buf), "<i><span size=\"smaller\">%s</span></i>", _("Comma separated list of networks is accepted."));
gtk_label_set_markup (GTK_LABEL (label), buf);
gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 3, 4);

8
src/fe-gtk/palette.c
View File

@@ -122,7 +122,7 @@ palette_load (void)
/* mIRC colors 0-31 are here */
for (i = 0; i < 32; i++)
{
snprintf (prefname, sizeof prefname, "color_%d", i);
g_snprintf (prefname, sizeof prefname, "color_%d", i);
cfg_get_color (cfg, prefname, &red, &green, &blue);
colors[i].red = red;
colors[i].green = green;
@@ -132,7 +132,7 @@ palette_load (void)
/* our special colors are mapped at 256+ */
for (i = 256, j = 32; j < MAX_COL+1; i++, j++)
{
snprintf (prefname, sizeof prefname, "color_%d", i);
g_snprintf (prefname, sizeof prefname, "color_%d", i);
cfg_get_color (cfg, prefname, &red, &green, &blue);
colors[j].red = red;
colors[j].green = green;
@@ -155,14 +155,14 @@ palette_save (void)
/* mIRC colors 0-31 are here */
for (i = 0; i < 32; i++)
{
snprintf (prefname, sizeof prefname, "color_%d", i);
g_snprintf (prefname, sizeof prefname, "color_%d", i);
cfg_put_color (fh, colors[i].red, colors[i].green, colors[i].blue, prefname);
}
/* our special colors are mapped at 256+ */
for (i = 256, j = 32; j < MAX_COL+1; i++, j++)
{
snprintf (prefname, sizeof prefname, "color_%d", i);
g_snprintf (prefname, sizeof prefname, "color_%d", i);
cfg_put_color (fh, colors[j].red, colors[j].green, colors[j].blue, prefname);
}

2
src/fe-gtk/rawlog.c
View File

@@ -109,7 +109,7 @@ open_rawlog (struct server *serv)
return;
}
snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Raw Log (%s)"), serv->servername);
g_snprintf (tbuf, sizeof tbuf, _(DISPLAY_NAME": Raw Log (%s)"), serv->servername);
serv->gui->rawlog_window =
mg_create_generic_tab ("RawLog", tbuf, FALSE, TRUE, close_rawlog, serv,
640, 320, &vbox, serv);

4
src/fe-gtk/servlistgui.c
View File

@@ -1658,7 +1658,7 @@ bold_label (char *text)
char buf[128];
GtkWidget *label;
snprintf (buf, sizeof (buf), "<b>%s</b>", text);
g_snprintf (buf, sizeof (buf), "<b>%s</b>", text);
label = gtk_label_new (buf);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
@@ -1700,7 +1700,7 @@ servlist_open_edit (GtkWidget *parent, ircnet *net)
editwindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_container_set_border_width (GTK_CONTAINER (editwindow), 4);
snprintf (buf, sizeof (buf), _(DISPLAY_NAME": Edit %s"), net->name);
g_snprintf (buf, sizeof (buf), _(DISPLAY_NAME": Edit %s"), net->name);
gtk_window_set_title (GTK_WINDOW (editwindow), buf);
gtk_window_set_default_size (GTK_WINDOW (editwindow), netedit_win_width, netedit_win_height);
gtk_window_set_transient_for (GTK_WINDOW (editwindow), GTK_WINDOW (parent));

10
src/fe-gtk/setup.c
View File

@@ -631,7 +631,7 @@ setup_headlabel (GtkWidget *tab, int row, int col, char *text)
char buf[128];
char *sp;
snprintf (buf, sizeof (buf), "<b><span size=\"smaller\">%s</span></b>", text);
g_snprintf (buf, sizeof (buf), "<b><span size=\"smaller\">%s</span></b>", text);
sp = strchr (buf + 17, ' ');
if (sp)
*sp = '\n';
@@ -753,7 +753,7 @@ setup_create_italic_label (char *text)
char buf[256];
label = gtk_label_new (NULL);
snprintf (buf, sizeof (buf), "<i><span size=\"smaller\">%s</span></i>", text);
g_snprintf (buf, sizeof (buf), "<i><span size=\"smaller\">%s</span></i>", text);
gtk_label_set_markup (GTK_LABEL (label), buf);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
@@ -1221,9 +1221,9 @@ setup_create_header (GtkWidget *table, int row, char *labeltext)
char buf[128];
if (row == 0)
snprintf (buf, sizeof (buf), "<b>%s</b>", _(labeltext));
g_snprintf (buf, sizeof (buf), "<b>%s</b>", _(labeltext));
else
snprintf (buf, sizeof (buf), "\n<b>%s</b>", _(labeltext));
g_snprintf (buf, sizeof (buf), "\n<b>%s</b>", _(labeltext));
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), buf);
@@ -1790,7 +1790,7 @@ setup_add_page (const char *title, GtkWidget *book, GtkWidget *tab)
/* label */
label = gtk_label_new (NULL);
snprintf (buf, sizeof (buf), "<b><big>%s</big></b>", _(title));
g_snprintf (buf, sizeof (buf), "<b><big>%s</big></b>", _(title));
gtk_label_set_markup (GTK_LABEL (label), buf);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_misc_set_padding (GTK_MISC (label), 2, 1);

12
src/fe-gtk/userlistgui.c
View File

@@ -42,11 +42,11 @@
enum
{
COL_PIX=0, // GdkPixbuf *
COL_NICK=1, // char *
COL_HOST=2, // char *
COL_USER=3, // struct User *
COL_GDKCOLOR=4 // GdkColor *
COL_PIX=0, /* GdkPixbuf * */
COL_NICK=1, /* char * */
COL_HOST=2, /* char * */
COL_USER=3, /* struct User * */
COL_GDKCOLOR=4 /* GdkColor * */
};
@@ -105,7 +105,7 @@ fe_userlist_numbers (session *sess)
{
if (sess->total)
{
snprintf (tbuf, sizeof (tbuf), _("%d ops, %d total"), sess->ops, sess->total);
g_snprintf (tbuf, sizeof (tbuf), _("%d ops, %d total"), sess->ops, sess->total);
tbuf[sizeof (tbuf) - 1] = 0;
gtk_label_set_text (GTK_LABEL (sess->gui->namelistinfo), tbuf);
} else