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

Variable cleanup for input_*

Browse Source
This commit is contained in:
Berke Viktor
2012-10-22 14:18:20 +02:00
parent bf27d43052
commit 5c49b45a6d
12 changed files with 85 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/fe-gtk/plugin-tray.c
View File

@@ -170,7 +170,7 @@ fe_tray_set_balloon (const char *title, const char *text)
g_free ((char *)notify_title);
g_free ((char *)notify_text);
notify_notification_set_timeout (notification, prefs.input_balloon_time*1000);
notify_notification_set_timeout (notification, prefs.hex_input_balloon_time*1000);
notify_notification_show (notification, NULL);
g_object_unref (notification);
@@ -520,9 +520,9 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
#ifndef WIN32 /* somehow this is broken on win32 */
submenu = mg_submenu (menu, _("_Blink on"));
blink_item (&prefs.input_tray_chans, submenu, _("Channel Message"));
blink_item (&prefs.input_tray_priv, submenu, _("Private Message"));
blink_item (&prefs.input_tray_hilight, submenu, _("Highlighted Message"));
blink_item (&prefs.hex_input_tray_chans, submenu, _("Channel Message"));
blink_item (&prefs.hex_input_tray_priv, submenu, _("Private Message"));
blink_item (&prefs.hex_input_tray_hilight, submenu, _("Highlighted Message"));
/*blink_item (BIT_FILEOFFER, submenu, _("File Offer"));*/
submenu = mg_submenu (menu, _("_Change status"));
@@ -578,7 +578,7 @@ tray_hilight_cb (char *word[], void *userdata)
/*if (tray_status == TS_HIGHLIGHT)
return XCHAT_EAT_NONE;*/
if (prefs.input_tray_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_tray_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
{
tray_set_flash (ICON_HILIGHT);
@@ -592,7 +592,7 @@ tray_hilight_cb (char *word[], void *userdata)
tray_hilight_count, word[1], xchat_get_info (ph, "channel"));
}
if (prefs.input_balloon_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_balloon_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
@@ -605,7 +605,7 @@ tray_message_cb (char *word[], void *userdata)
if (/*tray_status == TS_MESSAGE ||*/ tray_status == TS_HIGHLIGHT)
return XCHAT_EAT_NONE;
if (prefs.input_tray_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_tray_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
{
tray_set_flash (ICON_MSG);
@@ -617,7 +617,7 @@ tray_message_cb (char *word[], void *userdata)
tray_set_tipf (_(DISPLAY_NAME": %u new public messages."), tray_pub_count);
}
if (prefs.input_balloon_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_balloon_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"),
word[1], xchat_get_info (ph, "channel"));
@@ -646,7 +646,7 @@ tray_priv (char *from, char *text)
tray_set_tipf (_(DISPLAY_NAME": %u private messages, latest from: %s (%s)"),
tray_priv_count, from, network);
if (prefs.input_balloon_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_balloon_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_set_balloonf (text, _(DISPLAY_NAME": Private message from: %s (%s)"),
from, network);
}
@@ -657,7 +657,7 @@ tray_priv_cb (char *word[], void *userdata)
/*if (tray_status == TS_HIGHLIGHT)
return XCHAT_EAT_NONE;*/
if (prefs.input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_priv (word[1], word[2]);
return XCHAT_EAT_NONE;
@@ -669,7 +669,7 @@ tray_invited_cb (char *word[], void *userdata)
/*if (tray_status == TS_HIGHLIGHT)
return XCHAT_EAT_NONE;*/
if (prefs.input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_priv (word[2], "Invited");
return XCHAT_EAT_NONE;
@@ -687,7 +687,7 @@ tray_dcc_cb (char *word[], void *userdata)
if (!network)
network = xchat_get_info (ph, "server");
if (prefs.input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
{
tray_set_flash (ICON_FILE);
@@ -700,7 +700,7 @@ tray_dcc_cb (char *word[], void *userdata)
tray_file_count, word[1], network);
}
if (prefs.input_balloon_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
if (prefs.hex_input_balloon_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"),
word[1], network);