diff -Nru indicator-appmenu-15.02.0+16.10.20160927/.bzr-builddeb/default.conf indicator-appmenu-15.02.0+16.10.20160927/.bzr-builddeb/default.conf --- indicator-appmenu-15.02.0+16.10.20160927/.bzr-builddeb/default.conf 1970-01-01 00:00:00.000000000 +0000 +++ indicator-appmenu-15.02.0+16.10.20160927/.bzr-builddeb/default.conf 2019-05-08 21:42:47.000000000 +0000 @@ -0,0 +1,2 @@ +[BUILDDEB] +split = True diff -Nru indicator-appmenu-15.02.0+16.10.20160927/debian/bzr-builder.manifest indicator-appmenu-15.02.0+16.10.20160927/debian/bzr-builder.manifest --- indicator-appmenu-15.02.0+16.10.20160927/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ indicator-appmenu-15.02.0+16.10.20160927/debian/bzr-builder.manifest 2019-05-08 21:42:48.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debversion}+201905082142 +lp:~khurshid-alam/indicator-appmenu/ignore-desktop revid:khurshid.alam@linuxmail.org-20190506135212-4jsbbigfhjf96xds diff -Nru indicator-appmenu-15.02.0+16.10.20160927/debian/changelog indicator-appmenu-15.02.0+16.10.20160927/debian/changelog --- indicator-appmenu-15.02.0+16.10.20160927/debian/changelog 2019-05-08 21:45:14.000000000 +0000 +++ indicator-appmenu-15.02.0+16.10.20160927/debian/changelog 2019-05-08 21:42:48.000000000 +0000 @@ -1,3 +1,9 @@ +indicator-appmenu (15.02.0+16.10.20160927-0ubuntu3+201905082142~ubuntu19.10.1) eoan; urgency=low + + * Auto build. + + -- Khurshid Alam Wed, 08 May 2019 21:42:48 +0000 + indicator-appmenu (15.02.0+16.10.20160927-0ubuntu3) artful; urgency=medium * debian/control, debian/rules: diff -Nru indicator-appmenu-15.02.0+16.10.20160927/src/gdk-get-func.c indicator-appmenu-15.02.0+16.10.20160927/src/gdk-get-func.c --- indicator-appmenu-15.02.0+16.10.20160927/src/gdk-get-func.c 2016-09-27 12:49:29.000000000 +0000 +++ indicator-appmenu-15.02.0+16.10.20160927/src/gdk-get-func.c 2019-05-08 21:42:47.000000000 +0000 @@ -93,13 +93,13 @@ hints_atom = gdk_x11_get_xatom_by_name_for_display (display, _XA_MOTIF_WM_HINTS); - gdk_error_trap_push (); + gdk_x11_display_error_trap_push (display); XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), window, hints_atom, 0, sizeof (MotifWmHints)/sizeof (long), False, AnyPropertyType, &type, &format, &nitems, &bytes_after, &data); - gdk_flush (); - if ((ret = gdk_error_trap_pop ())) + gdk_display_flush (display); + if ((ret = gdk_x11_display_error_trap_pop (display))) { g_warning ("%s: Unable to get hints for %u: Error Code: %d", G_STRFUNC, (guint32)window, ret); return NULL; diff -Nru indicator-appmenu-15.02.0+16.10.20160927/src/indicator-appmenu.c indicator-appmenu-15.02.0+16.10.20160927/src/indicator-appmenu.c --- indicator-appmenu-15.02.0+16.10.20160927/src/indicator-appmenu.c 2016-09-27 12:49:29.000000000 +0000 +++ indicator-appmenu-15.02.0+16.10.20160927/src/indicator-appmenu.c 2019-05-08 21:42:47.000000000 +0000 @@ -484,14 +484,14 @@ xev.xclient.data.l[3] = 0; xev.xclient.data.l[4] = 0; - gdk_error_trap_push (); + gdk_x11_display_error_trap_push (gdk_display_get_default ()); XSendEvent (gdk_x11_get_default_xdisplay (), gdk_x11_get_default_root_xwindow (), False, SubstructureRedirectMask | SubstructureNotifyMask, &xev); - gdk_flush (); - gdk_error_trap_pop_ignored (); + gdk_display_flush (gdk_display_get_default ()); + gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default ()); return; } @@ -1067,7 +1067,7 @@ if (menus == NULL) { gchar * uniquename = bamf_window_get_utf8_prop (window, "_GTK_UNIQUE_BUS_NAME"); - if (uniquename != NULL) { + if (uniquename != NULL && bamf_window_get_window_type(window) != BAMF_WINDOW_DESKTOP) { BamfApplication * app = bamf_matcher_get_application_for_window(iapp->matcher, window); menus = WINDOW_MENU(window_menu_model_new(app, window)); diff -Nru indicator-appmenu-15.02.0+16.10.20160927/src/window-menu.c indicator-appmenu-15.02.0+16.10.20160927/src/window-menu.c --- indicator-appmenu-15.02.0+16.10.20160927/src/window-menu.c 2016-09-27 12:49:29.000000000 +0000 +++ indicator-appmenu-15.02.0+16.10.20160927/src/window-menu.c 2019-05-08 21:42:47.000000000 +0000 @@ -24,8 +24,6 @@ #include "window-menu.h" #include "indicator-appmenu-marshal.h" -#define WINDOW_MENU_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), WINDOW_MENU_TYPE, WindowMenuPrivate)) /* Signals */ diff -Nru indicator-appmenu-15.02.0+16.10.20160927/src/window-menu-dbusmenu.c indicator-appmenu-15.02.0+16.10.20160927/src/window-menu-dbusmenu.c --- indicator-appmenu-15.02.0+16.10.20160927/src/window-menu-dbusmenu.c 2016-09-27 12:49:29.000000000 +0000 +++ indicator-appmenu-15.02.0+16.10.20160927/src/window-menu-dbusmenu.c 2019-05-08 21:42:47.000000000 +0000 @@ -57,7 +57,7 @@ }; #define WINDOW_MENU_DBUSMENU_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), WINDOW_MENU_DBUSMENU_TYPE, WindowMenuDbusmenuPrivate)) +(window_menu_dbusmenu_get_instance_private (WINDOW_MENU_DBUSMENU(o))) /* Prototypes */ @@ -81,7 +81,7 @@ static void entry_restore (WindowMenu * wm, IndicatorObjectEntry * entry); static void entry_activate (WindowMenu * wm, IndicatorObjectEntry * entry, guint timestamp); -G_DEFINE_TYPE (WindowMenuDbusmenu, window_menu_dbusmenu, WINDOW_MENU_TYPE); +G_DEFINE_TYPE_WITH_PRIVATE (WindowMenuDbusmenu, window_menu_dbusmenu, WINDOW_MENU_TYPE); /* Build the one-time class */ static void @@ -89,8 +89,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (WindowMenuDbusmenuPrivate)); - object_class->dispose = window_menu_dbusmenu_dispose; WindowMenuClass * menu_class = WINDOW_MENU_CLASS(klass); @@ -617,14 +615,14 @@ if (children != NULL) { gpointer * data = g_new(gpointer, 2); data[0] = user_data; - data[1] = g_object_ref(newentry); + data[1] = (DbusmenuMenuitem*)g_object_ref(newentry); g_signal_connect_data(G_OBJECT(children->data), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(menu_child_realized), data, child_realized_data_cleanup, 0); } else { /* Menu entry has no children */ gpointer * data = g_new(gpointer, 2); data[0] = user_data; - data[1] = g_object_ref(newentry); + data[1] = (DbusmenuMenuitem*)g_object_ref(newentry);; /* Make sure the menu item gets displayed on the menu bar */ menu_child_realized(NULL, data); diff -Nru indicator-appmenu-15.02.0+16.10.20160927/src/window-menu-model.c indicator-appmenu-15.02.0+16.10.20160927/src/window-menu-model.c --- indicator-appmenu-15.02.0+16.10.20160927/src/window-menu-model.c 2016-09-27 12:49:29.000000000 +0000 +++ indicator-appmenu-15.02.0+16.10.20160927/src/window-menu-model.c 2019-05-08 21:42:47.000000000 +0000 @@ -48,7 +48,7 @@ }; #define WINDOW_MENU_MODEL_GET_PRIVATE(o) \ -(G_TYPE_INSTANCE_GET_PRIVATE ((o), WINDOW_MENU_MODEL_TYPE, WindowMenuModelPrivate)) +(window_menu_model_get_instance_private (WINDOW_MENU_MODEL(o))) /* Base class stuff */ static void window_menu_model_class_init (WindowMenuModelClass *klass); @@ -64,7 +64,7 @@ static guint get_xid (WindowMenu * wm); /* GLib boilerplate */ -G_DEFINE_TYPE (WindowMenuModel, window_menu_model, WINDOW_MENU_TYPE); +G_DEFINE_TYPE_WITH_PRIVATE (WindowMenuModel, window_menu_model, WINDOW_MENU_TYPE); /* Prefixes to the action muxer */ #define ACTION_MUX_PREFIX_APP "app" @@ -79,8 +79,6 @@ { GObjectClass *object_class = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (WindowMenuModelPrivate)); - object_class->dispose = window_menu_model_dispose; WindowMenuClass * wm_class = WINDOW_MENU_CLASS(klass); @@ -146,7 +144,7 @@ { g_return_if_fail(G_IS_MENU_MODEL(model)); - menu->priv->app_menu_model = g_object_ref(model); + menu->priv->app_menu_model = (GDBusMenuModel*)g_object_ref(model); menu->priv->application_menu.parent_window = menu->priv->xid; if (appname != NULL) { @@ -398,7 +396,7 @@ static void add_window_menu (WindowMenuModel * menu, GMenuModel * model) { - menu->priv->win_menu_model = g_object_ref(model); + menu->priv->win_menu_model = (GDBusMenuModel*)g_object_ref(model); menu->priv->win_menu = GTK_MENU_BAR(gtk_menu_bar_new_from_model(model)); g_assert(menu->priv->win_menu != NULL);