rpms/empathy/devel button-images.patch, NONE, 1.1 empathy.spec, 1.61, 1.62
Matthias Clasen
mclasen at fedoraproject.org
Thu Jul 16 18:47:55 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/empathy/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14096
Modified Files:
empathy.spec
Added Files:
button-images.patch
Log Message:
Deal with some buttons
button-images.patch:
--- NEW FILE button-images.patch ---
diff -up empathy-2.27.4/libempathy-gtk/empathy-new-message-dialog.ui.button-images empathy-2.27.4/libempathy-gtk/empathy-new-message-dialog.ui
--- empathy-2.27.4/libempathy-gtk/empathy-new-message-dialog.ui.button-images 2009-07-16 14:39:09.911582772 -0400
+++ empathy-2.27.4/libempathy-gtk/empathy-new-message-dialog.ui 2009-07-16 14:42:29.660614918 -0400
@@ -1,6 +1,14 @@
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<interface>
+ <object class="GtkImage" id="call_image">
+ <property name="icon_name">audio-input-microphone</property>
+ <property name="icon-size">4</property>
+ </object>
+ <object class="GtkImage" id="chat_image">
+ <property name="icon_name">im-message-new</property>
+ <property name="icon-size">4</property>
+ </object>
<object class="GtkDialog" id="new_message_dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
@@ -82,41 +90,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="icon_name">audio-input-microphone</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">C_all</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">call_image</property>
+ <property name="label" translatable="yes">C_all</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="position">1</property>
@@ -128,41 +104,9 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="icon_name">im-message-new</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">C_hat</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">chat_image</property>
+ <property name="label" translatable="yes">C_hat</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="position">2</property>
diff -up empathy-2.27.4/src/empathy-accounts-dialog.ui.button-images empathy-2.27.4/src/empathy-accounts-dialog.ui
--- empathy-2.27.4/src/empathy-accounts-dialog.ui.button-images 2009-07-16 14:23:32.512361372 -0400
+++ empathy-2.27.4/src/empathy-accounts-dialog.ui 2009-07-16 14:25:00.288598827 -0400
@@ -2,6 +2,10 @@
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkImage" id="add_image">
+ <property name="stock">gtk-add</property>
+ <property name="icon-size">4</property>
+ </object>
<object class="GtkDialog" id="accounts_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Accounts</property>
@@ -56,42 +60,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Add...</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">add_image</property>
+ <property name="label" translatable="yes">_Add...</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="position">0</property>
diff -up empathy-2.27.4/src/empathy-main-window.ui.button-images empathy-2.27.4/src/empathy-main-window.ui
diff -up empathy-2.27.4/src/empathy-new-chatroom-dialog.ui.button-images empathy-2.27.4/src/empathy-new-chatroom-dialog.ui
--- empathy-2.27.4/src/empathy-new-chatroom-dialog.ui.button-images 2009-07-16 14:20:36.799613393 -0400
+++ empathy-2.27.4/src/empathy-new-chatroom-dialog.ui 2009-07-16 14:22:06.493333193 -0400
@@ -2,6 +2,10 @@
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkImage" id="join_image">
+ <property name="stock">gtk-jump-to</property>
+ <property name="icon-size">4</property>
+ </object>
<object class="GtkDialog" id="new_chatroom_dialog">
<property name="visible">True</property>
<property name="border_width">5</property>
@@ -245,42 +249,9 @@
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkHBox" id="hbox29">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-jump-to</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label79">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Join</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="image">join_image</property>
+ <property name="label" translatable="yes">_Join</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/devel/empathy.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- empathy.spec 15 Jul 2009 13:46:13 -0000 1.61
+++ empathy.spec 16 Jul 2009 18:47:25 -0000 1.62
@@ -11,7 +11,7 @@
Name: empathy
Version: 2.27.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Instant Messaging Client for GNOME
Group: Applications/Communications
@@ -26,6 +26,9 @@ Source1: %{name}-README.ConnectionManage
## http://bugzilla.gnome.org/show_bug.cgi?id=577863
Patch1: %{name}-broken-pkgconfig.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=588810
+Patch2: button-images.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: enchant-devel >= %{enchant_version}
@@ -125,6 +128,7 @@ bindings to the libempathy and libempath
%prep
%setup -q
%patch1 -p1 -b .pkgconfig
+%patch2 -p1 -b .button-images
# force these to be regenerated
rm data/empathy.desktop
@@ -232,6 +236,9 @@ fi
%{python_sitearch}/empathy*.so
%changelog
+* Thu Jul 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.4-2
+- Deal with some stubborn buttons
+
* Wed Jul 15 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.27.4-1
- Update to 2.27.4.
- See http://download.gnome.org/sources/empathy/2.27/empathy-2.27.4.news
More information about the fedora-extras-commits
mailing list