← Back to branch summary

~ubuntu-branches/ubuntu/quantal/gnome-screenshot/quantal-proposed

« back to all changes in this revision

Viewing changes to src/screenshot-utils.c

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2012-06-04 17:09:33 UTC
  • mfrom: (1.2.4)
  • Revision ID: package-import@ubuntu.com-20120604170933-uqrl91r2eipe1ya4
Tags: 3.5.2-0ubuntu1
https://launchpad.net/bugs/1008595
* New upstream release (LP: #1008595)
  - Add a --file commandline option
  - Add an --include-pointer commandline option
  - Don't warn if fallback X11 code path is hit
  - Warn if --interactive is combined with --clipboard
  - Rename "whole desktop" to "whole screen"
  - Use GResource for UI files
* Refresh patches 
* debian/control: Increase minimum glib version in line with upstream 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/screenshot-utils.c
631
631
    }
632
632
 
633
633
  if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
634
 
    screenshot = screenshot_fallback_get_pixbuf (rectangle);
 
634
      screenshot = screenshot_fallback_get_pixbuf(rectangle);
635
635
  else {
636
 
  connection = screenshot_application_get_session_bus ();
 
636
  connection = g_application_get_dbus_connection (g_application_get_default ());
637
637
  g_dbus_connection_call_sync (connection,
638
638
                               "org.gnome.Shell",
639
639
                               "/org/gnome/Shell",
656
656
 
657
657
  if (error != NULL)
658
658
    {
659
 
      g_warning ("Unable to use GNOME Shell's builtin screenshot interface, "
660
 
                 "resorting to fallback X11. Error: %s", error->message);
 
659
      g_message ("Unable to use GNOME Shell's builtin screenshot interface, "
 
660
                 "resorting to fallback X11.");
661
661
      g_error_free (error);
662
662
 
663
663
      screenshot = screenshot_fallback_get_pixbuf (rectangle);