Use glib WIN32 defines
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
#include "maingui.h"
|
||||
#include "menu.h"
|
||||
|
||||
#ifndef WIN32
|
||||
#ifndef G_OS_WIN32
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
@@ -63,7 +63,7 @@ typedef GdkPixbuf* TrayIcon;
|
||||
static GtkStatusIcon *sticon;
|
||||
static gint flash_tag;
|
||||
static TrayStatus tray_status;
|
||||
#ifdef WIN32
|
||||
#ifdef G_OS_WIN32
|
||||
static guint tray_menu_timer;
|
||||
static gint64 tray_menu_inactivetime;
|
||||
#endif
|
||||
@@ -481,12 +481,12 @@ tray_menu_destroy (GtkWidget *menu, gpointer userdata)
|
||||
{
|
||||
gtk_widget_destroy (menu);
|
||||
g_object_unref (menu);
|
||||
#ifdef WIN32
|
||||
#ifdef G_OS_WIN32
|
||||
g_source_remove (tray_menu_timer);
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef G_OS_WIN32
|
||||
static gboolean
|
||||
tray_menu_enter_cb (GtkWidget *menu)
|
||||
{
|
||||
@@ -547,7 +547,7 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
|
||||
tray_make_item (menu, _("_Hide Window"), tray_menu_restore_cb, NULL);
|
||||
tray_make_item (menu, NULL, tray_menu_quit_cb, NULL);
|
||||
|
||||
#ifndef WIN32 /* submenus are buggy on win32 */
|
||||
#ifndef G_OS_WIN32 /* submenus are buggy on win32 */
|
||||
submenu = mg_submenu (menu, _("_Blink on"));
|
||||
blink_item (&prefs.hex_input_tray_chans, submenu, _("Channel Message"));
|
||||
blink_item (&prefs.hex_input_tray_priv, submenu, _("Private Message"));
|
||||
@@ -579,7 +579,7 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata)
|
||||
g_object_unref (menu);
|
||||
g_signal_connect (G_OBJECT (menu), "selection-done",
|
||||
G_CALLBACK (tray_menu_destroy), NULL);
|
||||
#ifdef WIN32
|
||||
#ifdef G_OS_WIN32
|
||||
g_signal_connect (G_OBJECT (menu), "leave-notify-event",
|
||||
G_CALLBACK (tray_menu_left_cb), NULL);
|
||||
g_signal_connect (G_OBJECT (menu), "enter-notify-event",
|
||||
@@ -802,7 +802,7 @@ tray_plugin_init (hexchat_plugin *plugin_handle, char **plugin_name,
|
||||
int
|
||||
tray_plugin_deinit (hexchat_plugin *plugin_handle)
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef G_OS_WIN32
|
||||
tray_cleanup ();
|
||||
#endif
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user