~indicator-applet-developers/indicator-appmenu/trunk.13.04

« back to all changes in this revision

Viewing changes to src/hudindicatorsource.c

Committer: Ted Gould
Date: 2012-03-18 18:58:06 UTC
mfrom: (166.3.29 gmenumodel-menus)
mto: (2.23.13 ubuntu)
mto: This revision was merged to the branch mainline in revision 219.
Revision ID: ted@gould.cx-20120318185806-ix9wrt1ny18ikjb6

* Upstream Merge
* GMenuModel menu support

files added:
src/gactionmuxer.c

src/gactionmuxer.h

src/gactionobservable.c

src/gactionobservable.h

src/gactionobserver.c

src/gactionobserver.h

src/window-menu-model.c

src/window-menu-model.h

src/window-menu.c

src/window-menu.h

files renamed:
src/window-menus.c => src/window-menu-dbusmenu.c

src/window-menus.h => src/window-menu-dbusmenu.h

files modified:
configure.ac

debian/changelog

po/POTFILES.in

po/POTFILES.skip

src/Makefile.am

src/hud-service.c

src/hudappindicatorsource.c

src/huddbusmenucollector.c

src/huddbusmenucollector.h

src/hudindicatorsource.c

src/huditem.c

src/hudmenumodelcollector.c

src/hudmenumodelcollector.h

src/hudresult.c

src/hudwindowsource.c

src/indicator-appmenu.c

src/usage-tracker.c

tests/Makefile.am

tests/test-bad-app-info.c

tests/test-distance.c

tests/test-load-app-info.c

tests/test-usage-db-ancient.c

tests/test-usage-db-old.c

tests/test-usage-db-simple.c

tests/test-usage-db-testapp.c

Show diffs side-by-side

added added

removed removed

src/hudindicatorsource.c

147

HudIndicatorSourceIndicator *indicator = user_data;

148

HudDbusmenuCollector *collector;

149

150

collector = hud_dbusmenu_collector_new_for_endpoint (_(indicator->info->user_visible_name),

150

collector = hud_dbusmenu_collector_new_for_endpoint (indicator->info->indicator_name,

151

_(indicator->info->user_visible_name),

151

152

hud_settings.indicator_penalty,

152

153

name_owner, indicator->info->dbus_menu_path);

153

154

g_signal_connect (collector, "changed", G_CALLBACK (hud_indicator_source_collector_changed), indicator);

Older »