[linux] fix gtk_menu_popup deprecation warning

shurcooL · Oct 25, 2019 · 867c15a · 867c15a
1 parent 04779f7
commit 867c15a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/platform/linux/tray.c b/platform/linux/tray.c
@@ -107,7 +107,8 @@ void create_indicator(void *handle)
 
 static void tray_icon_on_menu(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data)
 {
-    gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
+    // gtk_menu_popup_at_widget(GTK_MENU(menu), NULL, GDK_GRAVITY_SOUTH_EAST, NULL, gtk_get_current_event_time());
+    gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
 }
 
 void create_status_icon()
@@ -146,6 +147,10 @@ void init(const char* title, struct image imageData)
     }
 }
 
+void external_main_loop() {
+  gtk_widget_show_all(menu);
+}
+
 void native_loop()
 {
   external_main_loop();
@@ -157,9 +162,6 @@ void exit_loop()
   gtk_main_quit();
 }
 
-void external_main_loop() {
-  gtk_widget_show_all(menu);
-}
 
 
 #endif // NATIVE_C
diff --git a/trayhost.go b/trayhost.go
@@ -10,7 +10,7 @@ import (
 #cgo darwin LDFLAGS: -framework Cocoa
 
 #cgo linux pkg-config: gtk+-3.0 appindicator3-0.1 libnotify
-#cgo linux CFLAGS: -DLINUX
+#cgo linux CFLAGS: -DLINUX -Wno-deprecated-declarations
 #cgo linux LDFLAGS: -ldl
 
 #cgo windows CFLAGS: -DWIN32