gpar2/gpar2-0.3.diff

   1 diff -rupN gpar2-0.3/gpar2.cc gpar2-0.3.new/gpar2.cc
   2 --- gpar2-0.3/gpar2.cc  2006-02-25 16:05:26.000000000 +0100
   3 +++ gpar2-0.3.new/gpar2.cc      2011-12-27 23:57:16.933191444 +0100
   4 @@ -1,5 +1,5 @@
   5  #include "gpar2.h"
   6 -
   7 +#include <libintl.h>
   8
   9  int main(int argc, char *argv[])
  10  {
  11 diff -rupN gpar2-0.3/gpar2.desktop gpar2-0.3.new/gpar2.desktop
  12 --- gpar2-0.3/gpar2.desktop     2006-02-27 19:19:41.000000000 +0100
  13 +++ gpar2-0.3.new/gpar2.desktop 2011-12-27 23:57:16.936524776 +0100
  14 @@ -2,11 +2,11 @@
  15  Name=GPar2
  16  Comment=GUI for Parity Volumes
  17  Comment[fr]=Gestionnaire de volumes de parité
  18 -Icon=gnome-main-menu
  19 +Icon=gpar2
  20  Exec=gpar2 %f
  21  Terminal=false
  22 -MimeType=application/x-par;application/x-par2
  23 +MimeType=application/x-par;application/x-par2;
  24  Type=Application
  25 -Categories=Application;Utility;
  26 -Encoding=UTF-8
  27 +Categories=System;Filesystem;
  28 +Version=1.0
  29  StartupNotify=true
  30 diff -rupN gpar2-0.3/mainwindow.cc gpar2-0.3.new/mainwindow.cc
  31 --- gpar2-0.3/mainwindow.cc     2006-02-26 18:20:22.000000000 +0100
  32 +++ gpar2-0.3.new/mainwindow.cc 2011-12-27 23:57:00.406524464 +0100
  33 @@ -20,7 +20,7 @@ MainWindow::MainWindow(char* text)
  34    nbdone = 0.0;
  35    set_title("GPar2 " + version);
  36    set_resizable(false);
  37 -  set_icon_from_file("/usr/share/pixmaps/gnome-logo-icon-transparent.png");
  38 +  set_icon_from_file("/usr/share/pixmaps/gpar2.png");
  39    set_size_request(600, 350);
  40    add(main_VBox);
  41    file_loaded = false;
  42 @@ -167,7 +167,7 @@ MainWindow::MainWindow(char* text)
  43    globalProgress.set_text(" ");
  44    //progressBar.set_fraction(0.5);
  45    //progressBar.set_text("Coucou");
  46 -  //progressBar.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("red"));
  47 +  //progressBar.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("red"));
  48
  49
  50    // Files done
  51 @@ -280,7 +280,7 @@ void MainWindow::preprocess()
  52    bool res = commandline->Parse(3, argv);
  53    if (res == false) {
  54      status_label.set_text("Error !");
  55 -    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("red"));
  56 +    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("red"));
  57    }
  58    else {
  59      // Repair damaged files
  60 @@ -467,42 +467,42 @@ void MainWindow::update_status(Result re
  61   switch (result) {
  62    case eSuccess:
  63      status_label.set_text(_("Complete"));
  64 -    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("green"));
  65 +    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("green"));
  66      status = complete;
  67      break;
  68    case eRepairPossible:
  69      status_label.set_text(_("Repair possible"));
  70 -    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("blue"));
  71 +    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("blue"));
  72      status = repairable;
  73      break;
  74    case eRepairNotPossible:
  75      status_label.set_text(_("Repair not possible"));
  76 -    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("red"));
  77 +    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("red"));
  78      status = unrepairable;
  79      break;
  80    case eInsufficientCriticalData:
  81      status_label.set_text(_("Insufficient critical data"));
  82 -    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("red"));
  83 +    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("red"));
  84      status = unrepairable;
  85      break;
  86    case eRepairFailed:
  87      status_label.set_text(_("Repair failed"));
  88 -    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("red"));
  89 +    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("red"));
  90      status = unrepairable;
  91      break;
  92    case eFileIOError:
  93      status_label.set_text(_("I/O error"));
  94 -    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("red"));
  95 +    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("red"));
  96      status = unrepairable;
  97      break;
  98    case eLogicError:
  99      status_label.set_text(_("Internal error"));
 100 -    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("red"));
 101 +    status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("red"));
 102      status = unrepairable;
 103      break;
 104   case eMemoryError:
 105     status_label.set_text(_("Out of memory"));
 106 -   status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color::Color("red"));
 107 +   status_frame.modify_bg(Gtk::STATE_NORMAL,Gdk::Color("red"));
 108     status = unrepairable;
 109     break;
 110   default:
 111 @@ -519,7 +519,7 @@ void MainWindow::errors(Error error)
 112                               Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, false);
 113      dialog.set_secondary_text(_("A recovery set must be loaded before it can be repaired.  Please check that a set has been loaded and try this request again."));
 114      status_label.set_text(_("Repair Failed"));
 115 -    status_frame.modify_bg(Gtk::STATE_NORMAL, Gdk::Color::Color("red"));
 116 +    status_frame.modify_bg(Gtk::STATE_NORMAL, Gdk::Color("red"));
 117      dialog.run();
 118      status_label.set_text("");
 119      status_frame.unset_bg(Gtk::STATE_NORMAL);
 120 @@ -530,7 +530,7 @@ void MainWindow::errors(Error error)
 121                               Gtk::MESSAGE_ERROR, Gtk::BUTTONS_OK, false);
 122      dialog.set_secondary_text(_("A recovery set must be loaded before verification.  Please check that a set has been loaded and try this request again."));
 123      status_label.set_text(_("Verification Failed"));
 124 -    status_frame.modify_bg(Gtk::STATE_NORMAL, Gdk::Color::Color("red"));
 125 +    status_frame.modify_bg(Gtk::STATE_NORMAL, Gdk::Color("red"));
 126      dialog.run();
 127      status_label.set_text("");
 128      status_frame.unset_bg(Gtk::STATE_NORMAL);
 129 diff -rupN gpar2-0.3/Makefile.am gpar2-0.3.new/Makefile.am
 130 --- gpar2-0.3/Makefile.am       2006-02-26 22:39:13.000000000 +0100
 131 +++ gpar2-0.3.new/Makefile.am   2011-12-27 23:58:53.946526604 +0100
 132 @@ -25,7 +25,7 @@ bin_PROGRAMS = gpar2
 133  gpar2_SOURCES = gpar2.cc gpar2.h \
 134         mainwindow.cc mainwindow.h
 135
 136 -AM_LDFLAGS = -lstdc++ -lsigc-2.0 `pkg-config gtkmm-2.4 --libs` -lpar2
 137 +AM_LDFLAGS = -lstdc++ -lsigc-2.0 `pkg-config gtkmm-2.4 --libs` -lpar2 -ldl
 138  INCLUDES = `pkg-config sigc++-2.0 gtkmm-2.4 --cflags`
 139  AM_CXXFLAGS = -DLOCALEDIR='"$(prefix)/share/locale"'
 140
 141 diff -rupN gpar2-0.3/Makefile.in gpar2-0.3.new/Makefile.in
 142 --- gpar2-0.3/Makefile.in       2006-02-26 22:40:37.000000000 +0100
 143 +++ gpar2-0.3.new/Makefile.in   2011-12-27 23:59:26.576527219 +0100
 144 @@ -187,7 +187,7 @@ target_alias = @target_alias@
 145  gpar2_SOURCES = gpar2.cc gpar2.h \
 146         mainwindow.cc mainwindow.h
 147
 148 -AM_LDFLAGS = -lstdc++ -lsigc-2.0 `pkg-config gtkmm-2.4 --libs` -lpar2
 149 +AM_LDFLAGS = -lstdc++ -lsigc-2.0 `pkg-config gtkmm-2.4 --libs` -lpar2 -ldl
 150  INCLUDES = `pkg-config sigc++-2.0 gtkmm-2.4 --cflags`
 151  AM_CXXFLAGS = -DLOCALEDIR='"$(prefix)/share/locale"'
 152  EXTRA_DIST = config.rpath gnome-logo-icon-transparent.png gpar2.xml \
 153 @@ -631,6 +631,8 @@ info: info-recursive
 154  info-am:
 155
 156  install-data-am:
 157 +       $(INSTALL_DATA) -D gnome-logo-icon-transparent.png $(DESTDIR)$(datadir)/pixmaps/gpar2.png
 158 +       $(INSTALL_DATA) -D gpar2.desktop $(DESTDIR)$(datadir)/applications/gpar2.desktop
 159
 160  install-exec-am: install-binPROGRAMS
 161