diff options
| author | Jamie Lenehan <lenehan@twibble.org> | 2006-06-19 10:02:10 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-06-19 10:02:10 +0000 |
| commit | 6b49a918f4e7160073612a8e833d1600cad3cae3 (patch) | |
| tree | d8a68aad659d061e6f00f55d4e98616780e7c9bc /packages | |
| parent | be040497fa491b257f23549c8042f9c3b3d6baff (diff) | |
| parent | c45177b0a5e5ae93918786a7069da4fb1c24b83d (diff) | |
merge of 19c7f21b75299e2823cd9f6ccedbeebb643f4e53
and a2bf373810307badc5a8742e077888a4be329c07
Diffstat (limited to 'packages')
3 files changed, 2 insertions, 43 deletions
diff --git a/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty b/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-mediummount/opie-mediummount-1.2.1/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch b/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch deleted file mode 100644 index fd5542e392..0000000000 --- a/packages/opie-mediummount/opie-mediummount-1.2.1/firststart-no-popup.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: mainwindow.cc -=================================================================== -RCS file: /cvs/opie/noncore/settings/mediummount/mainwindow.cc,v -retrieving revision 1.7 -diff -u -r1.7 mainwindow.cc ---- mediummount/mainwindow.cc 19 Sep 2004 19:11:07 -0000 1.7 -+++ mediummount/mainwindow.cc 14 Jun 2006 15:30:05 -0000 -@@ -1,5 +1,6 @@ - - -+#include <qpe/config.h> - #include <qtabwidget.h> - #include <qlayout.h> - #include <qtooltip.h> -@@ -20,15 +21,20 @@ - : QDialog( parent, name, modal, WStyle_ContextHelp ) - - { -- setCaption ( tr( "Medium Mount Settings" )); -+ Config c( "qpe" ); -+ c.setGroup( "Startup" ); -+ if ( c.readNumEntry( "FirstUse", 42 ) != 0 ) -+ { -+ setCaption ( tr( "Medium Mount Settings" )); - -- m_lay = new QVBoxLayout( this ); -+ m_lay = new QVBoxLayout( this ); - -- m_tab = new QTabWidget( this ); -+ m_tab = new QTabWidget( this ); - -- m_lay->addWidget( m_tab ); -+ m_lay->addWidget( m_tab ); - -- init(); -+ init(); -+ } - } - - MainWindow::~MainWindow() diff --git a/packages/opie-mediummount/opie-mediummount_1.2.1.bb b/packages/opie-mediummount/opie-mediummount_1.2.1.bb index 0eaff4ad86..c80bbb032b 100644 --- a/packages/opie-mediummount/opie-mediummount_1.2.1.bb +++ b/packages/opie-mediummount/opie-mediummount_1.2.1.bb @@ -1,8 +1,7 @@ include ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ - file://firststart-no-popup.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps " |