← Back to branch summary

~ubuntu-branches/ubuntu/precise/gtk+2.0/precise-updates

« back to all changes in this revision

Viewing changes to gtk/gtkentry.c

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2011-12-01 11:40:06 UTC
  • mfrom: (1.14.11)
  • Revision ID: package-import@ubuntu.com-20111201114006-nrmf6qu3pg512veo
Tags: 2.24.8-0ubuntu1
https://launchpad.net/bugs/189494
https://launchpad.net/bugs/889019
* New upstream release 
  - gtkfilechooser should be more robust to malformed URIs
    in .gtk-bookmarks (LP: #189494)
* debian/patches/010_make_bg_changes_queue_repaint.patch
  - dropped it introduces performance regressions in some gtk2 
    apps (LP: #889019)
* 101_filechooser.patch, 000git_file_chooser.patch: dropped, upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/gtkentry.c
3688
3688
    }
3689
3689
  
3690
3690
  tmp_pos = gtk_entry_find_position (entry, event->x + entry->scroll_offset);
3691
 
    
3692
 
  if (event->button == 1)
 
3691
 
 
3692
  if (_gtk_button_event_triggers_context_menu (event))
 
3693
    {
 
3694
      gtk_entry_do_popup (entry, event);
 
3695
      entry->button = 0;        /* Don't wait for release, since the menu will gtk_grab_add */
 
3696
 
 
3697
      return TRUE;
 
3698
    }
 
3699
  else if (event->button == 1)
3693
3700
    {
3694
3701
      gboolean have_selection = gtk_editable_get_selection_bounds (editable, &sel_start, &sel_end);
3695
3702
      
3696
3703
      entry->select_words = FALSE;
3697
3704
      entry->select_lines = FALSE;
3698
3705
 
3699
 
      if (event->state & GDK_SHIFT_MASK)
 
3706
      if (event->state & GTK_EXTEND_SELECTION_MOD_MASK)
3700
3707
        {
3701
3708
          _gtk_entry_reset_im_context (entry);
3702
3709
          
3810
3817
          gtk_widget_error_bell (widget);
3811
3818
        }
3812
3819
    }
3813
 
  else if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
3814
 
    {
3815
 
      gtk_entry_do_popup (entry, event);
3816
 
      entry->button = 0;        /* Don't wait for release, since the menu will gtk_grab_add */
3817
 
 
3818
 
      return TRUE;
3819
 
    }
3820
3820
 
3821
3821
  return FALSE;
3822
3822
}