rpms/dia/FC-4 dia-0.94-rh192699.patch,1.2,1.3

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/dia/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv5517

Modified Files:
	dia-0.94-rh192699.patch 
Log Message:
tum to tum

dia-0.94-rh192699.patch:
 app/app_procs.c               |   10 +++++-----
 app/display.c                 |   10 +++-------
 app/filedlg.c                 |   18 +++++++-----------
 app/interface.c               |    2 +-
 app/load_save.c               |    2 +-
 app/sheets.c                  |    2 +-
 lib/dia_image.c               |    2 +-
 lib/message.c                 |    2 +-
 plug-ins/python/diamodule.c   |    6 +++---
 plug-ins/python/pydia-error.c |    2 +-
 plug-ins/wmf/wmf.cpp          |    2 +-
 11 files changed, 25 insertions(+), 33 deletions(-)

Index: dia-0.94-rh192699.patch
===================================================================
RCS file: /cvs/dist/rpms/dia/FC-4/dia-0.94-rh192699.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dia-0.94-rh192699.patch	23 May 2006 12:29:45 -0000	1.2
+++ dia-0.94-rh192699.patch	23 May 2006 12:39:43 -0000	1.3
@@ -1,4 +1,3 @@
-Only in dia-0.95/app: .#filedlg.c
 diff -ur dia-0.95.orig/app/app_procs.c dia-0.95/app/app_procs.c
 --- dia-0.95.orig/app/app_procs.c	2006-02-27 22:29:02.000000000 +0100
 +++ dia-0.95/app/app_procs.c	2006-05-22 22:22:37.000000000 +0200
@@ -38,7 +37,6 @@
        }
  
        exit(0);
-Only in dia-0.95/app: app_procs.c~
 diff -ur dia-0.95.orig/app/display.c dia-0.95/app/display.c
 --- dia-0.95.orig/app/display.c	2006-03-20 22:24:26.000000000 +0100
 +++ dia-0.95/app/display.c	2006-05-23 09:39:40.000000000 +0200
@@ -73,7 +71,6 @@
    gtk_window_set_title (GTK_WINDOW(dialog), _("Close Diagram"));
  
    button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
-Only in dia-0.95/app: display.c~
 diff -ur dia-0.95.orig/app/filedlg.c dia-0.95/app/filedlg.c
 --- dia-0.95.orig/app/filedlg.c	2006-02-05 14:42:09.000000000 +0100
 +++ dia-0.95/app/filedlg.c	2006-05-23 09:41:29.000000000 +0200
@@ -127,7 +124,6 @@
        gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
  
        if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_YES) {
-Only in dia-0.95/app: filedlg.c~
 diff -ur dia-0.95.orig/app/interface.c dia-0.95/app/interface.c
 --- dia-0.95.orig/app/interface.c	2006-05-22 22:23:52.000000000 +0200
 +++ dia-0.95/app/interface.c	2006-05-22 21:59:00.000000000 +0200
@@ -140,7 +136,6 @@
    } else {
      persistence_set_string("last-sheet-selected", string);
      fill_sheet_wbox(sheet);
-Only in dia-0.95/app: interface.c~
 diff -ur dia-0.95.orig/app/load_save.c dia-0.95/app/load_save.c
 --- dia-0.95.orig/app/load_save.c	2006-02-11 23:48:06.000000000 +0100
 +++ dia-0.95/app/load_save.c	2006-05-22 21:57:39.000000000 +0200
@@ -153,7 +148,6 @@
    }
    g_hash_table_destroy(unknown_hash);
    g_string_free(unknown_str, TRUE);
-Only in dia-0.95/app: load_save.c~
 diff -ur dia-0.95.orig/app/sheets.c dia-0.95/app/sheets.c
 --- dia-0.95.orig/app/sheets.c	2006-02-26 10:52:32.000000000 +0100
 +++ dia-0.95/app/sheets.c	2006-05-22 21:56:44.000000000 +0200
@@ -166,7 +160,6 @@
          g_error_free (error);
  	*pixmap = gdk_pixmap_colormap_create_from_xpm_d
  	  (NULL,
-Only in dia-0.95/app: sheets.c~
 diff -ur dia-0.95.orig/lib/dia_image.c dia-0.95/lib/dia_image.c
 --- dia-0.95.orig/lib/dia_image.c	2005-11-03 23:22:03.000000000 +0100
 +++ dia-0.95/lib/dia_image.c	2006-05-22 22:06:26.000000000 +0200
@@ -179,7 +172,6 @@
      g_error_free (error);
      return NULL;
    }
-Only in dia-0.95/lib: dia_image.c~
 diff -ur dia-0.95.orig/lib/message.c dia-0.95/lib/message.c
 --- dia-0.95.orig/lib/message.c	2006-05-22 22:24:18.000000000 +0200
 +++ dia-0.95/lib/message.c	2006-05-22 21:55:02.000000000 +0200
@@ -192,7 +184,6 @@
    if (title) {
      gchar *real_title;
  
-Only in dia-0.95: log
 diff -ur dia-0.95.orig/plug-ins/python/diamodule.c dia-0.95/plug-ins/python/diamodule.c
 --- dia-0.95.orig/plug-ins/python/diamodule.c	2005-08-29 07:17:51.000000000 +0200
 +++ dia-0.95/plug-ins/python/diamodule.c	2006-05-22 22:04:37.000000000 +0200
@@ -211,7 +202,6 @@
  
      Py_INCREF(Py_None);
      return Py_None;
-Only in dia-0.95/plug-ins/python: diamodule.c~
 diff -ur dia-0.95.orig/plug-ins/python/pydia-error.c dia-0.95/plug-ins/python/pydia-error.c
 --- dia-0.95.orig/plug-ins/python/pydia-error.c	2005-09-13 22:19:27.000000000 +0200
 +++ dia-0.95/plug-ins/python/pydia-error.c	2006-05-22 22:04:02.000000000 +0200
@@ -224,7 +214,6 @@
    g_free (sLoc);
    Py_DECREF (ef);
    Py_XDECREF(exc);
-Only in dia-0.95/plug-ins/python: pydia-error.c~
 diff -ur dia-0.95.orig/plug-ins/wmf/wmf.cpp dia-0.95/plug-ins/wmf/wmf.cpp
 --- dia-0.95.orig/plug-ins/wmf/wmf.cpp	2006-02-20 22:12:02.000000000 +0100
 +++ dia-0.95/plug-ins/wmf/wmf.cpp	2006-05-22 22:23:00.000000000 +0200
@@ -237,4 +226,3 @@
  
      g_free(string);
  }
-Only in dia-0.95/plug-ins/wmf: wmf.cpp~