← Back to branch summary

~bregma/geis/lp-997630

« back to all changes in this revision

Viewing changes to libutouch-geis/geis_v1.c

https://launchpad.net/bugs/1009270
Merge fix for geisv1 subscriptions not activating when devices are added

Show diffs side-by-side

added added

removed removed

Lines of Context:
libutouch-geis/geis_v1.c
619
619
  {
620
620
    const char **g;
621
621
 
622
 
    geis_debug("subscribing device %d for the following gestures:", device_id);
623
 
    result = geis_filter_add_term(instance->window_filter,
624
 
                        GEIS_FILTER_DEVICE,
625
 
                        GEIS_DEVICE_ATTRIBUTE_ID, GEIS_FILTER_OP_EQ, device_id,
626
 
                        NULL);
627
 
    if (result != GEIS_STATUS_SUCCESS)
 
622
    if (device_id != 0)
628
623
    {
629
 
      geis_error("error adding device filter term");
 
624
      geis_debug("subscribing device %d for the following gestures:", device_id);
 
625
      result = geis_filter_add_term(instance->window_filter,
 
626
                          GEIS_FILTER_DEVICE,
 
627
                          GEIS_DEVICE_ATTRIBUTE_ID, GEIS_FILTER_OP_EQ,
 
628
                          device_id, NULL);
 
629
      if (result != GEIS_STATUS_SUCCESS)
 
630
      {
 
631
        geis_error("error adding device filter term");
 
632
      }
630
633
    }
631
634
 
632
635
    for (g = gesture_list; *g; ++g)