![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package gnome-utils checked in at Thu Aug 14 01:23:51 CEST 2008. -------- --- GNOME/gnome-utils/gnome-utils.changes 2008-07-18 20:53:25.000000000 +0200 +++ gnome-utils/gnome-utils.changes 2008-07-27 17:49:22.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Jul 27 17:47:00 CEST 2008 - vuntz@novell.com + +- Add gnome-utils-fate302358-screenshot-copy.patch: add a copy + button to the screenshot dialog. Fix FATE#302358 and bgo#99897. + +------------------------------------------------------------------- New: ---- gnome-utils-fate302358-screenshot-copy.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-utils.spec ++++++ --- /var/tmp/diff_new_pack.h31655/_old 2008-08-14 01:22:31.000000000 +0200 +++ /var/tmp/diff_new_pack.h31655/_new 2008-08-14 01:22:31.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package gnome-utils (Version 2.20.0.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,7 +25,7 @@ Provides: gnome-utils2 Obsoletes: gnome-utils2 Version: 2.20.0.1 -Release: 133 +Release: 149 Summary: Basic Utilities for the GNOME 2.x Desktop Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-utils/2.16/%{name}-%{version}.tar.bz2 Source2: logviewer.png @@ -36,6 +43,8 @@ Patch30: system-search-in-desktop-files.patch # PATCH-FIX-OPENSUSE gnome-utils-no-docpath-in-search-tool.patch vuntz@novell.com -- Remove DocPath from the .desktop file (so that it doesnt appear in yelp toc) Patch31: gnome-utils-no-docpath-in-search-tool.patch +# PATCH-FEATURE-UPSTREAM gnome-utils-fate302358-screenshot-copy.patch fate302358 bgo99897 vuntz@novell.com -- Add copy button to the screenshot tool. Note that the upstream bug has a patch that applies to trunk as of 2008-07-27 (what is in 2.23). +Patch32: gnome-utils-fate302358-screenshot-copy.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gnome-icon-theme tango-icon-theme @@ -306,6 +315,7 @@ #%patch29 -p1 %patch30 -p1 %patch31 -p1 +%patch32 -p1 gnome-patch-translation-update %build @@ -401,6 +411,9 @@ %{_datadir}/gtk-doc/html/gdict %changelog +* Sun Jul 27 2008 vuntz@novell.com +- Add gnome-utils-fate302358-screenshot-copy.patch: add a copy + button to the screenshot dialog. Fix FATE#302358 and bgo#99897. * Fri Jul 18 2008 rodrigo@suse.de - Tag and upstream some patches. * Tue Jul 01 2008 maw@suse.de ++++++ gnome-utils-fate302358-screenshot-copy.patch ++++++ diff -aur gnome-utils-2.20.0.1.orig/gnome-screenshot/gnome-screenshot.c gnome-utils-2.20.0.1/gnome-screenshot/gnome-screenshot.c --- gnome-utils-2.20.0.1.orig/gnome-screenshot/gnome-screenshot.c 2007-09-06 15:49:02.000000000 +0200 +++ gnome-utils-2.20.0.1/gnome-screenshot/gnome-screenshot.c 2008-07-27 17:43:40.000000000 +0200 @@ -653,6 +653,18 @@ keep_going = TRUE; } break; + case SCREENSHOT_RESPONSE_COPY: + { + GtkClipboard *clipboard; + GdkPixbuf *screenshot; + + clipboard = gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (toplevel)), + GDK_SELECTION_CLIPBOARD); + screenshot = screenshot_dialog_get_screenshot (dialog); + gtk_clipboard_set_image (clipboard, screenshot); + } + keep_going = TRUE; + break; default: break; } diff -aur gnome-utils-2.20.0.1.orig/gnome-screenshot/gnome-screenshot.glade gnome-utils-2.20.0.1/gnome-screenshot/gnome-screenshot.glade --- gnome-utils-2.20.0.1.orig/gnome-screenshot/gnome-screenshot.glade 2007-09-06 15:49:02.000000000 +0200 +++ gnome-utils-2.20.0.1/gnome-screenshot/gnome-screenshot.glade 2008-07-27 17:41:35.000000000 +0200 @@ -1,259 +1,194 @@ -<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*--> -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> +<!--*- mode: xml -*--> <glade-interface> -<requires lib="gnome"/> - -<widget class="GtkDialog" id="toplevel"> - <property name="border_width">5</property> - <property name="title" translatable="yes">Save Screenshot</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">False</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="has_separator">False</property> - <signal name="key_press_event" handler="on_toplevel_key_press_event" last_modification_time="Thu, 21 Oct 2004 13:29:25 GMT"/> - - <child internal-child="vbox"> - <widget class="GtkVBox" id="dialog-vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child internal-child="action_area"> - <widget class="GtkHButtonBox" id="dialog-action_area1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - - <child> - <widget class="GtkButton" id="help_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-help</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-11</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-6</property> - </widget> - </child> - - <child> - <widget class="GtkButton" id="ok_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-save</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="response_id">-5</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">GTK_PACK_END</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox3"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">18</property> - - <child> - <widget class="GtkHBox" id="hbox6"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkAspectFrame" id="aspect_frame"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="ratio">1</property> - <property name="obey_child">True</property> - - <child> - <widget class="GtkDrawingArea" id="preview_darea"> - <property name="visible">True</property> - <signal name="expose_event" handler="on_preview_expose_event"/> - <signal name="configure_event" handler="on_preview_configure_event"/> - </widget> - </child> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkTable" id="table1"> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Name:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">filename_entry</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="label" translatable="yes">Save in _folder:</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="filename_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">True</property> - <property name="width_chars">24</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="file_chooser_box"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - + <widget class="GtkDialog" id="toplevel"> + <property name="border_width">5</property> + <property name="title" translatable="yes">Save Screenshot</property> + <property name="resizable">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="has_separator">False</property> + <signal name="key_press_event" handler="on_toplevel_key_press_event"/> + <child internal-child="vbox"> + <widget class="GtkVBox" id="dialog-vbox1"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkVBox" id="vbox3"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="spacing">18</property> + <child> + <widget class="GtkHBox" id="hbox6"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkAspectFrame" id="aspect_frame"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="label_yalign">0</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <child> + <widget class="GtkDrawingArea" id="preview_darea"> + <property name="visible">True</property> + <signal name="expose_event" handler="on_preview_expose_event"/> + <signal name="configure_event" handler="on_preview_configure_event"/> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="expand">False</property> + </packing> + </child> + <child> + <widget class="GtkTable" id="table1"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <widget class="GtkHBox" id="file_chooser_box"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="filename_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">True</property> + <property name="width_chars">24</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Save in _folder:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">filename_entry</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child internal-child="action_area"> + <widget class="GtkHButtonBox" id="dialog-action_area1"> + <property name="visible">True</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <widget class="GtkButton" id="help_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-help</property> + <property name="use_stock">True</property> + <property name="response_id">-11</property> + </widget> + </child> + <child> + <widget class="GtkButton" id="copy_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="label" translatable="yes">gtk-copy</property> + <property name="use_stock">True</property> + <property name="response_id">1</property> + <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <property name="response_id">-6</property> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="ok_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="label">gtk-save</property> + <property name="use_stock">True</property> + <property name="response_id">-5</property> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="pack_type">GTK_PACK_END</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface> diff -aur gnome-utils-2.20.0.1.orig/gnome-screenshot/screenshot-dialog.c gnome-utils-2.20.0.1/gnome-screenshot/screenshot-dialog.c --- gnome-utils-2.20.0.1.orig/gnome-screenshot/screenshot-dialog.c 2007-09-06 15:49:02.000000000 +0200 +++ gnome-utils-2.20.0.1/gnome-screenshot/screenshot-dialog.c 2008-07-27 17:41:35.000000000 +0200 @@ -344,6 +344,13 @@ { return gtk_file_chooser_get_current_folder_uri (GTK_FILE_CHOOSER (dialog->save_widget)); } + +GdkPixbuf * +screenshot_dialog_get_screenshot (ScreenshotDialog *dialog) +{ + return dialog->screenshot; +} + void screenshot_dialog_set_busy (ScreenshotDialog *dialog, gboolean busy) diff -aur gnome-utils-2.20.0.1.orig/gnome-screenshot/screenshot-dialog.h gnome-utils-2.20.0.1/gnome-screenshot/screenshot-dialog.h --- gnome-utils-2.20.0.1.orig/gnome-screenshot/screenshot-dialog.h 2007-09-06 15:49:02.000000000 +0200 +++ gnome-utils-2.20.0.1/gnome-screenshot/screenshot-dialog.h 2008-07-27 17:41:35.000000000 +0200 @@ -6,6 +6,9 @@ typedef struct ScreenshotDialog ScreenshotDialog; +/* Keep in sync with the value defined in the glade file */ +#define SCREENSHOT_RESPONSE_COPY 1 + ScreenshotDialog *screenshot_dialog_new (GdkPixbuf *screenshot, char *initial_uri, gboolean take_window_shot); @@ -13,6 +16,7 @@ GtkWidget *screenshot_dialog_get_toplevel (ScreenshotDialog *dialog); char *screenshot_dialog_get_uri (ScreenshotDialog *dialog); char *screenshot_dialog_get_folder (ScreenshotDialog *dialog); +GdkPixbuf *screenshot_dialog_get_screenshot (ScreenshotDialog *dialog); void screenshot_dialog_set_busy (ScreenshotDialog *dialog, gboolean busy); #endif /* __SCREENSHOT_DIALOG_H__ */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de