diff options
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/about.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/maingui.c | 2 | ||||
| -rw-r--r-- | src/fe-gtk/plugin-tray.c | 6 | ||||
| -rw-r--r-- | src/fe-gtk/setup.c | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c index 647d6603..54b71053 100644 --- a/src/fe-gtk/about.c +++ b/src/fe-gtk/about.c @@ -143,7 +143,7 @@ menu_about (GtkWidget * wid, gpointer sess) gtk_label_set_markup (GTK_LABEL (label_info), buf); /* label for copyright notices */ - snprintf (buf, sizeof (buf), "<small>\302\251 1998-2010 Peter \305\275elezn\303\275\n\302\251 2009-2012 Berke Viktor</small>"); + snprintf (buf, sizeof (buf), "<small>\302\251 1998-2010 Peter \305\275elezn\303\275\n\302\251 2009-2013 Berke Viktor</small>"); label_copyright = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (label_copyright), 0, 0); gtk_box_pack_start (GTK_BOX (vbox_text), label_copyright, 0, 0, 10); diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c index 2796b381..41344c8f 100644 --- a/src/fe-gtk/maingui.c +++ b/src/fe-gtk/maingui.c @@ -2856,7 +2856,7 @@ mg_create_entry (session *sess, GtkWidget *box) GTK_SHADOW_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, - GTK_POLICY_NEVER); + GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (sw), entry); gtk_container_add (GTK_CONTAINER (hbox), sw); #else diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 3c9bed38..694e4c35 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -173,7 +173,11 @@ fe_tray_set_balloon (const char *title, const char *text) notify_text = strip_color (text, -1, STRIP_ALL|STRIP_ESCMARKUP); notify_title = strip_color (title, -1, STRIP_ALL); - notification = XC_NOTIFY_NEW (notify_title, notify_text, HEXCHATSHAREDIR "/pixmaps/hexchat.png", NULL); + notification = XC_NOTIFY_NEW (notify_title, notify_text, HEXCHATSHAREDIR "/icons/hicolor/scalable/apps/hexchat.svg", NULL); + +#if NOTIFY_CHECK_VERSION(0,7,0) + notify_notification_set_hint (notification, "desktop-entry", g_variant_new_string ("hexchat")); +#endif g_free ((char *)notify_title); g_free ((char *)notify_text); diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index e46c5031..f02bc3d7 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -216,6 +216,7 @@ static const setting inputbox_settings[] = {ST_TOGGLE, N_("Show user mode icon in nick box"), P_OFFINTNL(hex_gui_input_icon),0,0,0}, #if defined(USE_GTKSPELL) || defined(USE_LIBSEXY) {ST_TOGGLE, N_("Spell checking"), P_OFFINTNL(hex_gui_input_spell),0,0,2}, +#ifdef HAVE_ISO_CODES /* Defined with static spelling */ {ST_ENTRY, N_("Dictionaries to use:"), P_OFFSETNL(hex_text_spell_langs),0,0,sizeof prefs.hex_text_spell_langs}, #ifdef WIN32 {ST_LABEL, N_("Use language codes (as in \"share\\myspell\\dicts\").\nSeparate multiple entries with commas.")}, @@ -223,6 +224,7 @@ static const setting inputbox_settings[] = {ST_LABEL, N_("Use language codes. Separate multiple entries with commas.")}, #endif #endif +#endif {ST_HEADER, N_("Nick Completion"),0,0,0}, {ST_TOGGLE, N_("Automatic nick completion (without TAB key)"), P_OFFINTNL(hex_completion_auto), @@ -1514,7 +1516,7 @@ setup_create_color_page (void) setup_create_other_color (_("New message:"), COL_NEW_MSG, 10, tab); setup_create_other_colorR (_("Away user:"), COL_AWAY, 10, tab); setup_create_other_color (_("Highlight:"), COL_HILIGHT, 11, tab); -#if defined(USE_GTKSPELL) || defined(USE_LIBSEXY) +#ifdef HAVE_ISO_CODES /* Defined with static spelling */ setup_create_other_colorR (_("Spell checker:"), COL_SPELL, 11, tab); #endif |