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

Update XChat to r1516

Browse Source
This commit is contained in:
Berke Viktor
2012-07-14 20:46:42 +02:00
parent a5cc3b15d7
commit c80cb47e5c
8 changed files with 5 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -565,10 +565,8 @@ menu_destroy (GtkWidget *menu, gpointer objtounref)
static void
menu_popup (GtkWidget *menu, GdkEventButton *event, gpointer objtounref)
{
#if (GTK_MAJOR_VERSION != 2) || (GTK_MINOR_VERSION != 0)
if (event && event->window)
gtk_menu_set_screen (GTK_MENU (menu), gdk_drawable_get_screen (event->window));
#endif
g_object_ref (menu);
g_object_ref_sink (menu);
@@ -1746,8 +1744,6 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
return item;
}
#if GTK_CHECK_VERSION(2,4,0)
/* Override the default GTK2.4 handler, which would make menu
bindings not work when the menu-bar is hidden. */
static gboolean
@@ -1761,9 +1757,6 @@ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
#endif
}
#endif
/* === STUFF FOR /MENU === */
static GtkMenuItem *
@@ -2139,10 +2132,8 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
/* /MENU needs to know this later */
g_object_set_data (G_OBJECT (menu_bar), "accel", accel_group);
#if GTK_CHECK_VERSION(2,4,0)
g_signal_connect (G_OBJECT (menu_bar), "can-activate-accel",
G_CALLBACK (menu_canacaccel), 0);
#endif
/* set the initial state of toggles */
mymenu[MENUBAR_OFFSET].state = !prefs.hidemenu;