← Back to branch summary

~ubuntu-branches/ubuntu/precise/mupen64plus/precise

« back to all changes in this revision

Viewing changes to debian/patches/remove-nondfsg-icons.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sven Eckelmann
  • Date: 2009-09-28 15:23:17 UTC
  • Revision ID: james.westby@ubuntu.com-20090928152317-84y17o8hlh7batmw
Tags: 1.5+dfsg1-5
http://bugs.debian.org/546046
http://bugs.debian.org/547644
* debian/patches:
  - Change to dep3 patch tagging guidelines
  - Remove number before patches as order is given by debian/patches/series
  - Add gtk-open-filter.patch, Show files with .n64 and .v64 extension in
    filtered open file dialog (Closes: #546046)
  - Add noexecstack.patch, Don't enable executable stack by default
    (Closes: #547644)
  - Add fix_readpng.patch, Fix crash when loading png due to reordering
    optimizer
  - Add jttl_fix_romclosed.patch, Stop audio processing thread before freeing
    buffers to fix segfault during stop of emulation
  - Add rice_nodebug.patch, Don't enable excessive debug functionality in
    rice_video
  - Add interpreter_x86_fldcw.patch, Correctly set floating point control word
  - Add load-fpr-location.patch, Set register bank location when loading
    savestate

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/remove-nondfsg-icons.patch
 
1
Description: Remove non-dfsg clean icons from build
 
2
Bug: http://code.google.com/p/mupen64plus/issues/detail?id=239
 
3
Author: Sven Eckelmann <sven.eckelmann@gmx.de>
 
4
 
 
5
---
 
6
diff --git a/glide64/messagebox_gtk2.c b/glide64/messagebox_gtk2.c
 
7
index 349666ec1898330d9617e24cf4c43614eb5d53ee..28acfd906b6c7e86c07274a44309837808e01a54 100644
 
8
--- a/glide64/messagebox_gtk2.c
 
9
+++ b/glide64/messagebox_gtk2.c
 
10
@@ -23,12 +23,6 @@
 
11
 #include <stdarg.h>
 
12
 #include <stdio.h>
 
13
 
 
14
-// include icons
 
15
-#include "icons/messagebox-error.xpm"
 
16
-#include "icons/messagebox-info.xpm"
 
17
-#include "icons/messagebox-quest.xpm"
 
18
-#include "icons/messagebox-warn.xpm"
 
19
-
 
20
 static gint delete_question_event(GtkWidget *widget, GdkEvent *event, gpointer data)
 
21
 {
 
22
    return TRUE; // undeleteable
 
23
@@ -127,26 +121,6 @@ messagebox( const char *title, int flags, const char *fmt, ... )
 
24
     gtk_box_pack_start( GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, TRUE, 0 );
 
25
     gtk_widget_show( hbox );
 
26
 
 
27
-    // icon
 
28
-    switch( flags & 0x00000F00 )
 
29
-    {
 
30
-    case MB_ICONWARNING:
 
31
-        icon = create_pixmap_d( dialog, messagebox_warn_xpm );
 
32
-        break;
 
33
-
 
34
-    case MB_ICONINFORMATION:
 
35
-        icon = create_pixmap_d( dialog, messagebox_info_xpm );
 
36
-        break;
 
37
-
 
38
-    case MB_ICONQUESTION:
 
39
-        icon = create_pixmap_d( dialog, messagebox_quest_xpm );
 
40
-        break;
 
41
-
 
42
-    case MB_ICONERROR:
 
43
-        icon = create_pixmap_d( dialog, messagebox_error_xpm );
 
44
-        break;
 
45
-    }
 
46
-
 
47
     if( icon )
 
48
     {
 
49
         gtk_box_pack_start( GTK_BOX(hbox), icon, FALSE, FALSE, 0 );
 
50
diff --git a/glide64/messagebox_qt4.cpp b/glide64/messagebox_qt4.cpp
 
51
index e8ffc3bb0080f3b35b330535abf9f4fc785d8a8a..9bddd868263de1761fee5ff28d6e1f3e76cc3a7a 100644
 
52
--- a/glide64/messagebox_qt4.cpp
 
53
+++ b/glide64/messagebox_qt4.cpp
 
54
@@ -30,11 +30,6 @@
 
55
 #include <stdio.h>
 
56
 #include <assert.h>
 
57
 
 
58
-#include "icons/messagebox-error.xpm"
 
59
-#include "icons/messagebox-info.xpm"
 
60
-#include "icons/messagebox-quest.xpm"
 
61
-#include "icons/messagebox-warn.xpm"
 
62
-
 
63
 #include "Gfx1.3.h"
 
64
 #include "messagebox.h"
 
65
 
 
66
@@ -75,25 +70,6 @@ int messagebox(const char *title, int flags, const char *fmt, ...)
 
67
     QWaitCondition w;
 
68
     e->waitCondition = &w;
 
69
 
 
70
-    switch( flags & 0x00000F00 )
 
71
-    {
 
72
-        case MB_ICONWARNING:
 
73
-            e->image = QImage(messagebox_warn_xpm);
 
74
-            break;
 
75
-
 
76
-        case MB_ICONINFORMATION:
 
77
-            e->image = QImage(messagebox_info_xpm);
 
78
-            break;
 
79
-
 
80
-        case MB_ICONQUESTION:
 
81
-            e->image = QImage(messagebox_quest_xpm);
 
82
-            break;
 
83
-
 
84
-        case MB_ICONERROR:
 
85
-            e->image = QImage(messagebox_error_xpm);
 
86
-            break;
 
87
-    }
 
88
-
 
89
     QObject* target = 0;
 
90
     foreach (QWidget* w, qApp->topLevelWidgets()) {
 
91
         if (w->inherits("MainWindow")) {