Are you submitting this upstream?

Laca

On Wed, 2007-03-07 at 11:31 +0800, Rick Ju wrote:
> plain text document attachment (6524858.diff)
> Index: ChangeLog
> ===================================================================
> --- ChangeLog (revision 10778)
> +++ ChangeLog (working copy)
> @@ -1,3 +1,7 @@
> +2007-03-07  Rick Ju <rick.ju at sun.com>
> +        * base-specs/gaim-otr.spec:
> +     * patches/gaim-otr-02-gtk-ui.diff: Added. Fix for #6524858.
> +
>  2007-03-06  Damien Carbery <damien.carbery at sun.com>
>  
>       * SUNWgnome-media-apps.spec: Hard code %build_with_gnome_cd to 1
> Index: base-specs/gaim-otr.spec
> ===================================================================
> --- base-specs/gaim-otr.spec  (revision 10778)
> +++ base-specs/gaim-otr.spec  (working copy)
> @@ -21,6 +21,8 @@
>  Source1:     http://www.cypherpunks.ca/otr/libotr-%{libotr_version}.tar.gz
>  # date:2006-12-18 owner:rickju type:bug
>  Patch1:         gaim-otr-01-upgrade-gaim2b2.diff
> +# owner:rickju date:2007-03-07 type:bug bugster: 6524858
> +Patch2:         gaim-otr-02-gtk-ui.diff
>  URL:         http://www.cypherpunks.ca/otr/
>  BuildRoot:   %{_tmppath}/%{name}-%{version}-build
>  Docdir:              %{_defaultdocdir}/gaim
> @@ -53,6 +55,7 @@
>  #patch for gaim-otr
>  cd ../gaim-otr*
>  %patch1 -p0
> +%patch2 -p0
>  
>  %build
>  %ifos linux
> Index: patches/gaim-otr-02-gtk-ui.diff
> ===================================================================
> --- patches/gaim-otr-02-gtk-ui.diff   (revision 0)
> +++ patches/gaim-otr-02-gtk-ui.diff   (revision 0)
> @@ -0,0 +1,21 @@
> +--- gtk-ui.c    2007-03-06 11:52:06.032022000 +0800
> ++++ gtk-ui.c 2007-03-06 11:53:51.632355000 +0800
> +@@ -143,10 +143,14 @@
> + 
> + static void clist_all_unselected(void)
> + {
> +-    gtk_widget_set_sensitive(ui_layout.connect_button, 0);
> +-    gtk_widget_set_sensitive(ui_layout.disconnect_button, 0);
> +-    gtk_widget_set_sensitive(ui_layout.forget_button, 0);
> +-    gtk_widget_set_sensitive(ui_layout.verify_button, 0);
> ++    if (ui_layout.connect_button)
> ++      gtk_widget_set_sensitive(ui_layout.connect_button, 0);
> ++    if (ui_layout.disconnect_button)
> ++      gtk_widget_set_sensitive(ui_layout.disconnect_button, 0);
> ++    if (ui_layout.forget_button)
> ++      gtk_widget_set_sensitive(ui_layout.forget_button, 0);
> ++    if (ui_layout.verify_button)
> ++      gtk_widget_set_sensitive(ui_layout.verify_button, 0);
> +     ui_layout.selected_fprint = NULL;
> + }
> + 


Reply via email to