diff options
| author | Ted Gould <ted@gould.cx> | 2011-08-25 09:04:37 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-08-25 09:04:37 -0500 |
| commit | 22c49c1e43e913b7c9c453bb7aff8baf4905bc19 (patch) | |
| tree | a79a3ebf148ee1e50ab49639ead20f57e94137aa /src/indicator-messages.c | |
| parent | 7dc2668bf7cec024e84bc1d211fab455b4c60655 (diff) | |
| parent | ae8f3199a8f3c9d8ff1168465b136c579fac7385 (diff) | |
| download | ayatana-indicator-messages-22c49c1e43e913b7c9c453bb7aff8baf4905bc19.tar.gz ayatana-indicator-messages-22c49c1e43e913b7c9c453bb7aff8baf4905bc19.tar.bz2 ayatana-indicator-messages-22c49c1e43e913b7c9c453bb7aff8baf4905bc19.zip | |
* New upstream release.
* Fix naming of "Clear" item
* Fix alignment of items to there is a consistent gutter
Diffstat (limited to 'src/indicator-messages.c')
| -rw-r--r-- | src/indicator-messages.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/indicator-messages.c b/src/indicator-messages.c index f2baf83..2476d4d 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -581,11 +581,6 @@ new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new()); gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE); - gint padding = 4; - gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL); - - GtkWidget * hbox = gtk_hbox_new(FALSE, 0); - /* Set the minimum size, we always want it to take space */ gint width, height; gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); @@ -602,12 +597,10 @@ new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbu /* Application name in a label */ GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME)); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding); gtk_widget_show(label); /* Insert the hbox */ - gtk_container_add(GTK_CONTAINER(gmi), hbox); - gtk_widget_show(hbox); + gtk_container_add(GTK_CONTAINER(gmi), label); /* Attach some of the standard GTK stuff */ dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); @@ -698,9 +691,9 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm gint padding = 4; gint font_size = RIGHT_LABEL_FONT_SIZE; - gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL); + gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL); - GtkWidget * hbox = gtk_hbox_new(FALSE, 0); + GtkWidget * hbox = gtk_hbox_new(FALSE, padding); /* Icon, probably someone's face or avatar on an IM */ mi_data->icon = gtk_image_new(); @@ -735,7 +728,7 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm } } gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding); + gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0); if (pixbuf != NULL) { gtk_widget_show(mi_data->icon); @@ -744,7 +737,7 @@ new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusm /* Label, probably a username, chat room or mailbox name */ mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL)); gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5); - gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, padding); + gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0); gtk_widget_show(mi_data->label); /* Usually either the time or the count on the individual |