← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnome-shell/trusty-proposed

« back to all changes in this revision

Viewing changes to src/st/st-button.c

Tags: upstream-3.3.90
Import upstream version 3.3.90

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/st/st-button.c
41
41
#include "st-button.h"
42
42
 
43
43
#include "st-enum-types.h"
44
 
#include "st-marshal.h"
45
44
#include "st-texture-cache.h"
46
45
#include "st-private.h"
47
46
 
164
163
  StButton *button = ST_BUTTON (actor);
165
164
  StButtonMask mask = ST_BUTTON_MASK_FROM_BUTTON (event->button);
166
165
 
167
 
  st_widget_hide_tooltip (ST_WIDGET (actor));
168
 
 
169
166
  if (button->priv->button_mask & mask)
170
167
    {
171
168
      if (button->priv->grabbed == 0)
210
207
{
211
208
  StButton *button = ST_BUTTON (actor);
212
209
 
213
 
  st_widget_hide_tooltip (ST_WIDGET (actor));
214
 
 
215
210
  if (button->priv->button_mask & ST_BUTTON_ONE)
216
211
    {
217
212
      if (event->keyval == CLUTTER_KEY_space ||
444
439
                  G_TYPE_FROM_CLASS (klass),
445
440
                  G_SIGNAL_RUN_LAST,
446
441
                  G_STRUCT_OFFSET (StButtonClass, clicked),
447
 
                  NULL, NULL,
448
 
                  _st_marshal_VOID__INT,
 
442
                  NULL, NULL, NULL,
449
443
                  G_TYPE_NONE, 1,
450
444
                  G_TYPE_INT);
451
445
}