← Back to branch summary

~ubuntu-branches/ubuntu/precise/gnome-screenshot/precise-updates

« back to all changes in this revision

Viewing changes to .pc/01_use-ubuntu-help.patch/src/screenshot-utils.c

  • Committer: Package Import Robot
  • Author(s): Didier Roche
  • Date: 2012-03-05 18:08:51 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20120305180851-50xrbk4rrn4034r0
Tags: 3.3.91-0ubuntu1
* New upstream release
  - Use the new Shell API to include mouse pointer
  - Make sure not to override the delay setting for non-interactive mode

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/01_use-ubuntu-help.patch/src/screenshot-utils.c
606
606
  if (screenshot_config->take_window_shot)
607
607
    {
608
608
      method_name = "ScreenshotWindow";
609
 
      method_params = g_variant_new ("(bbs)",
 
609
      method_params = g_variant_new ("(bbbs)",
610
610
                                     screenshot_config->include_border,
611
 
                                     TRUE,
 
611
                                     screenshot_config->include_pointer,
 
612
                                     TRUE, /* flash */
612
613
                                     filename);
613
614
    }
614
615
  else if (rectangle != NULL)
617
618
      method_params = g_variant_new ("(iiiibs)",
618
619
                                     rectangle->x, rectangle->y,
619
620
                                     rectangle->width, rectangle->height,
620
 
                                     TRUE,
 
621
                                     TRUE, /* flash */
621
622
                                     filename);
622
623
    }
623
624
  else
624
625
    {
625
626
      method_name = "Screenshot";
626
 
      method_params = g_variant_new ("(bs)", TRUE, filename);
 
627
      method_params = g_variant_new ("(bbs)",
 
628
                                     screenshot_config->include_pointer,
 
629
                                     TRUE, /* flash */
 
630
                                     filename);
627
631
    }
628
632
 
629
633
  connection = screenshot_application_get_session_bus ();
674
678
  GtkWindowGroup *group;
675
679
  gint response;
676
680
 
677
 
  g_return_if_fail ((parent == NULL) || (GTK_IS_WINDOW (parent)));
678
 
  g_return_if_fail (message != NULL);
 
681
  g_return_val_if_fail ((parent == NULL) || (GTK_IS_WINDOW (parent)),
 
682
                        GTK_RESPONSE_NONE);
 
683
  g_return_val_if_fail (message != NULL, GTK_RESPONSE_NONE);
679
684
  
680
685
  dialog = gtk_message_dialog_new (parent,
681
686
                                   GTK_DIALOG_DESTROY_WITH_PARENT,