← Back to branch summary

~ubuntu-branches/ubuntu/natty/indicator-appmenu/natty

« back to all changes in this revision

Viewing changes to src/indicator-appmenu.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2011-02-17 14:26:34 UTC
  • mfrom: (1.1.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20110217142634-qrjr7qm8f364fj87
Tags: 0.1.95-0ubuntu1
* New upstream release.
  * Accessible description support
* debian/control: Updating libindicator to 0.3.19

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/indicator-appmenu.c
91
91
        gulong sig_entry_added;
92
92
        gulong sig_entry_removed;
93
93
        gulong sig_show_menu;
 
94
        gulong sig_a11y_update;
94
95
 
95
96
        GtkMenuItem * close_item;
96
97
 
169
170
                                                                      IndicatorObjectEntry * entry,
170
171
                                                                      guint timestamp,
171
172
                                                                      gpointer user_data);
 
173
static void window_a11y_update                                       (WindowMenus * mw,
 
174
                                                                      IndicatorObjectEntry * entry,
 
175
                                                                      gpointer user_data);
172
176
static void active_window_changed                                    (BamfMatcher * matcher,
173
177
                                                                      BamfView * oldview,
174
178
                                                                      BamfView * newview,
1088
1092
                g_signal_handler_disconnect(G_OBJECT(iapp->default_app), iapp->sig_show_menu);
1089
1093
                iapp->sig_show_menu = 0;
1090
1094
        }
 
1095
        if (iapp->sig_a11y_update != 0) {
 
1096
                g_signal_handler_disconnect(G_OBJECT(iapp->default_app), iapp->sig_a11y_update);
 
1097
                iapp->sig_a11y_update = 0;
 
1098
        }
1091
1099
 
1092
1100
        /* Default App is NULL, let's see if it needs replacement */
1093
1101
        iapp->default_app = NULL;
1113
1121
                                                           WINDOW_MENUS_SIGNAL_SHOW_MENU,
1114
1122
                                                           G_CALLBACK(window_show_menu),
1115
1123
                                                           iapp);
 
1124
                iapp->sig_a11y_update   = g_signal_connect(G_OBJECT(iapp->default_app),
 
1125
                                                           WINDOW_MENUS_SIGNAL_A11Y_UPDATE,
 
1126
                                                           G_CALLBACK(window_a11y_update),
 
1127
                                                           iapp);
1116
1128
        }
1117
1129
 
1118
1130
        /* Get our new list of entries.  Now we can go ahead and signal
1390
1402
        return;
1391
1403
}
1392
1404
 
 
1405
/* Pass up the accessible string update */
 
1406
static void
 
1407
window_a11y_update (WindowMenus * mw, IndicatorObjectEntry * entry, gpointer user_data)
 
1408
{
 
1409
        g_signal_emit_by_name(G_OBJECT(user_data), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, entry);
 
1410
        return;
 
1411
}
 
1412
 
1393
1413
/**********************
1394
1414
  DEBUG INTERFACE
1395
1415
 **********************/