← Back to branch summary

~ubuntu-branches/ubuntu/utopic/nautilus/utopic-proposed

« back to all changes in this revision

Viewing changes to .pc/git_rename_background.patch/eel/eel-editable-label.c

  • Committer: Package Import Robot
  • Author(s): Tim Lunn
  • Date: 2014-01-02 16:50:06 UTC
  • mfrom: (1.17.43)
  • Revision ID: package-import@ubuntu.com-20140102165006-1ghk9ropzitdc8pp
Tags: 1:3.10.1-0ubuntu1
https://launchpad.net/bugs/1272602
* New upstream release
* debian/control.in: bump depend on gtk+ 3.9.11
* debian/patches:
  - Dropped git patches, that are included in new version
  - 06_never_exec_nonexec_launchers.patch, refreshed
  - disconnect-extra-location-widgets.patch, dropped included in new version
  - 16_unity_new_documents.patch, refreshed
  - ubuntu_show_titlebar.patch, disable CSD titlebar on non-GNOME sessions
  - ubuntu_titlebar_css.patch, theme fixes (LP: #1272602)

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/git_rename_background.patch/eel/eel-editable-label.c
2978
2978
static void
2979
2979
append_action_signal (EelEditableLabel     *label,
2980
2980
                      GtkWidget    *menu,
2981
 
                      const gchar  *stock_id,
 
2981
                      const gchar  *mnemonic_label,
2982
2982
                      const gchar  *signal,
2983
2983
                      gboolean      sensitive)
2984
2984
{
2985
 
  GtkWidget *menuitem = gtk_image_menu_item_new_from_stock (stock_id, NULL);
 
2985
  GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (mnemonic_label);
2986
2986
 
2987
2987
  g_object_set_data (G_OBJECT (menuitem), "gtk-signal", (char *)signal);
2988
2988
  g_signal_connect (menuitem, "activate",
3023
3023
 
3024
3024
  gdk_window_get_origin (label->text_area, x, y);
3025
3025
 
3026
 
  /*gtk_widget_size_request (label->popup_menu, &req);*/
3027
 
  gtk_widget_get_requisition (widget, &req);
 
3026
  gtk_widget_get_preferred_size (widget, &req, NULL);
3028
3027
  gtk_widget_get_allocation (widget, &allocation);
3029
3028
  
3030
3029
  *x += allocation.width / 2;
3053
3052
                        GtkSelectionData *data,
3054
3053
                        gpointer          user_data)
3055
3054
{
3056
 
  GtkWidget *menuitem, *submenu;
 
3055
  GtkWidget *menuitem;
3057
3056
  gboolean have_selection;
3058
3057
  gboolean clipboard_contains_text;
3059
3058
  PopupInfo *info;
3078
3077
  
3079
3078
      clipboard_contains_text = gtk_selection_data_targets_include_text (data);
3080
3079
 
3081
 
      append_action_signal (label, label->popup_menu, GTK_STOCK_CUT, "cut-clipboard",
3082
 
                            have_selection);
3083
 
      append_action_signal (label, label->popup_menu, GTK_STOCK_COPY, "copy-clipboard",
3084
 
                            have_selection);
3085
 
      append_action_signal (label, label->popup_menu, GTK_STOCK_PASTE, "paste-clipboard",
 
3080
      append_action_signal (label, label->popup_menu, _("Cu_t"), "cut-clipboard",
 
3081
                            have_selection);
 
3082
      append_action_signal (label, label->popup_menu, _("_Copy"), "copy-clipboard",
 
3083
                            have_selection);
 
3084
      append_action_signal (label, label->popup_menu, _("_Paste"), "paste-clipboard",
3086
3085
                            clipboard_contains_text);
3087
3086
  
3088
3087
      menuitem = gtk_menu_item_new_with_label (_("Select All"));
3092
3091
      gtk_widget_show (menuitem);
3093
3092
      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
3094
3093
 
3095
 
      menuitem = gtk_separator_menu_item_new ();
3096
 
      gtk_widget_show (menuitem);
3097
 
      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
3098
 
      
3099
 
      menuitem = gtk_menu_item_new_with_label (_("Input Methods"));
3100
 
      gtk_widget_show (menuitem);
3101
 
      submenu = gtk_menu_new ();
3102
 
      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
3103
 
      
3104
 
      gtk_menu_shell_append (GTK_MENU_SHELL (label->popup_menu), menuitem);
3105
 
  
3106
 
      gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (label->im_context),
3107
 
                                            GTK_MENU_SHELL (submenu));
3108
 
 
3109
3094
      g_signal_emit (label,
3110
3095
                     signals[POPULATE_POPUP], 0,
3111
3096
                     label->popup_menu);