diff options
| author | Ted Gould <ted@gould.cx> | 2009-12-10 12:53:54 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-10 12:53:54 -0600 |
| commit | af702a42770fcbd3140bd626941c6bbb5a714213 (patch) | |
| tree | 6c76a0010b228dd66f5aee868acbc58b7742fc1e /libdbusmenu-gtk | |
| parent | aaa4ebbb1825dc423b08dd6801712bc92556de86 (diff) | |
| parent | 3b94f54d8e4ae546c922e6561234ed2070d9c169 (diff) | |
| download | libdbusmenu-af702a42770fcbd3140bd626941c6bbb5a714213.tar.gz libdbusmenu-af702a42770fcbd3140bd626941c6bbb5a714213.tar.bz2 libdbusmenu-af702a42770fcbd3140bd626941c6bbb5a714213.zip | |
* Upstream release 0.1.8
* Changing the name to org.ayatana
* Underline fixes
* Documenation of the DBus API
Diffstat (limited to 'libdbusmenu-gtk')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 2 | ||||
| -rw-r--r-- | libdbusmenu-gtk/client.h | 3 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menu.c | 8 |
3 files changed, 11 insertions, 2 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 8489424..fdebc6b 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -359,6 +359,7 @@ new_item_normal (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusmenu GtkMenuItem * gmi; gmi = GTK_MENU_ITEM(gtk_menu_item_new_with_label(dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL))); + gtk_menu_item_set_use_underline (gmi, TRUE); if (gmi != NULL) { dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); @@ -489,6 +490,7 @@ new_item_image (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuC GtkMenuItem * gmi; gmi = GTK_MENU_ITEM(gtk_image_menu_item_new_with_label(dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL))); + gtk_menu_item_set_use_underline (gmi, TRUE); if (gmi != NULL) { dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); diff --git a/libdbusmenu-gtk/client.h b/libdbusmenu-gtk/client.h index b1d816f..4cfbdcf 100644 --- a/libdbusmenu-gtk/client.h +++ b/libdbusmenu-gtk/client.h @@ -29,8 +29,7 @@ License version 3 and version 2.1 along with this program. If not, see #ifndef __DBUSMENU_GTKCLIENT_H__ #define __DBUSMENU_GTKCLIENT_H__ -#include <glib.h> -#include <glib-object.h> +#include <gtk/gtk.h> #include <libdbusmenu-glib/client.h> G_BEGIN_DECLS diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c index 2dd7a6e..d2a8620 100644 --- a/libdbusmenu-gtk/menu.c +++ b/libdbusmenu-gtk/menu.c @@ -213,7 +213,9 @@ find_pos (GtkWidget * widget, gpointer data) static void root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint position, DbusmenuGtkMenu * menu) { + #ifdef MASSIVEDEBUGGING g_debug("Root new child"); + #endif DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), menu); @@ -240,7 +242,9 @@ root_child_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint posit static void root_child_moved (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint newposition, guint oldposition, DbusmenuGtkMenu * menu) { + #ifdef MASSIVEDEBUGGING g_debug("Root child moved"); + #endif DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); gtk_menu_reorder_child(GTK_MENU(menu), GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)), newposition); return; @@ -250,7 +254,9 @@ root_child_moved (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint newpo static void root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGtkMenu * menu) { + #ifdef MASSIVEDEBUGGING g_debug("Root child deleted"); + #endif DbusmenuGtkMenuPrivate * priv = DBUSMENU_GTKMENU_GET_PRIVATE(menu); GtkWidget * item = GTK_WIDGET(dbusmenu_gtkclient_menuitem_get(priv->client, child)); if (item != NULL) { @@ -268,7 +274,9 @@ root_child_delete (DbusmenuMenuitem * root, DbusmenuMenuitem * child, DbusmenuGt static void child_realized (DbusmenuMenuitem * child, gpointer userdata) { + #ifdef MASSIVEDEBUGGING g_debug("Root child realized"); + #endif g_return_if_fail(DBUSMENU_IS_GTKMENU(userdata)); DbusmenuGtkMenu * menu = DBUSMENU_GTKMENU(userdata); |