Revision 1921

trunk/plugins/networkmanager/networkmanager.c (revision 1921)
90 90
{
91 91
    NGPlugin *plugin_data = (NGPlugin*) data;
92 92

                
93
    switch (nm_client_get_state(NM_CLIENT(plugin_data->priv))) {
93
    switch (nm_client_get_state(NM_CLIENT(((struct _nm_plugin_data*)plugin_data->priv)->client))) {
94 94
        case NM_STATE_CONNECTED:
95 95
        case NM_STATE_UNKNOWN:
96 96
            if (((struct _nm_plugin_data*)plugin_data->priv)->schedular_stopped_by_this_plugin &&
trunk/client/gui/auto_shutdown.c (revision 1921)
18 18

                
19 19
#include "gui.h"
20 20

                
21
#if defined(HAVE_POLKIT) || defined(WIN32) || defined(DARWIN)
22 21
static gboolean autoshutdown_enabled = FALSE;
23 22

                
24 23
gboolean        perform_shutdown(void);
... ...
45 44
        g_idle_add((GSourceFunc) gtk_main_quit, NULL);
46 45
    }
47 46
}
48
#endif
49 47

                
50 48
void
51 49
autoshutdown_initialize(void)
... ...
54 52
        return;
55 53
    }
56 54

                
57
#if defined(HAVE_POLKIT) || defined(WIN32) || defined(DARWIN)
58
#ifndef HAVE_POLKIT1
59 55
    GtkWidget *toolbarMain = nntpgrab_gui_base_get_widget("toolbarMain");
60 56
    GtkToolItem *item = gtk_toggle_tool_button_new();
61 57
    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), _("Automatic shutdown"));
... ...
66 62

                
67 63
    g_signal_connect(item, "clicked", G_CALLBACK(tool_button_clicked), NULL);
68 64
    g_signal_connect(glue, "all_downloads_completed", G_CALLBACK(all_downloads_completed), NULL);
69
#endif
70
#endif
71 65
}
72 66

                
trunk/client/gui_qt/update_version.sh (revision 1921)
20 20
        mv tmp $SVN_REV_FILE
21 21
        sed s/exported/0/ $SVN_REV_FILE > tmp
22 22
        mv tmp $SVN_REV_FILE
23
        sed s/'Unversioned directory'/0/ $SVN_REV_FILE > tmp; \
24
        mv tmp $(SVN_REV_FILE); \
23
        sed s/'Unversioned directory'/0/ $SVN_REV_FILE > tmp
24
        mv tmp $SVN_REV_FILE
25 25
        sed s/M.*// $SVN_REV_FILE > tmp
26 26
        mv tmp $SVN_REV_FILE
27 27
        ;;
28 28
    *)
29 29
        sed -i.backup s/:.*// $SVN_REV_FILE
30 30
        sed -i.backup s/exported/0/ $SVN_REV_FILE
31
        sed -i.backup s/'Unversioned directory'/0/ $SVN_REV_FILE; \
31
        sed -i.backup s/'Unversioned directory'/0/ $SVN_REV_FILE
32 32
        sed -i.backup s/M.*// $SVN_REV_FILE
33 33
        ;;
34 34
esac
trunk/client/gui_qt/QNNTPGrabGlue.cpp (revision 1921)
256 256
    QList list_values;
257 257

                
258 258
    i = 0;
259
    while (values[i]) {
259
    while (values && values[i]) {
260 260
        list_values.append(QString::fromUtf8(values[i]));
261 261
        i++;
262 262
    }
trunk/client/gui_qt/DialogImportNZB.cpp (revision 1921)
318 318
    setVisible(false);
319 319
    loadNZBFile(nzb_data);
320 320
    if (allow_custom_collection_name) {
321
        ui->editNZBFile->setText(QNNTPGrabGlue::utilsSanitizeCollectionName(collection_name));
322
        btnAdd_clicked();
321
        DialogSetCollectionName d(glue, QNNTPGrabGlue::utilsSanitizeCollectionName(collection_name), this);
322
        switch (d.exec()) {
323
            case QDialog::Accepted:
324
                doImportNZB(d.getCollectionName());
325
                close();
326
                break;
327

                
328
            case QDialog::Rejected:
329
                break;
330
        }
323 331
    } else {
324 332
        doImportNZB(QNNTPGrabGlue::utilsSanitizeCollectionName(collection_name));
325 333
    }
branches/nntpgrab-0.7/plugins/networkmanager/networkmanager.c (revision 1921)
84 84
{
85 85
    NGPlugin *plugin_data = (NGPlugin*) data;
86 86

                
87
    switch (nm_client_get_state(NM_CLIENT(plugin_data->priv))) {
87
    switch (nm_client_get_state(NM_CLIENT(((struct _nm_plugin_data*)plugin_data->priv)->client))) {
88 88
        case NM_STATE_CONNECTED:
89 89
        case NM_STATE_UNKNOWN:
90 90
            if (((struct _nm_plugin_data*)plugin_data->priv)->schedular_stopped_by_this_plugin &&
branches/nntpgrab-0.7/client/gui/auto_shutdown.c (revision 1921)
18 18

                
19 19
#include "gui.h"
20 20

                
21
#if defined(HAVE_POLKIT) || defined(WIN32) || defined(DARWIN)
21
#if defined(HAVE_POLKIT1) || defined(HAVE_POLKIT_OLD) || defined(WIN32) || defined(DARWIN)
22 22
static gboolean autoshutdown_enabled = FALSE;
23 23

                
24 24
gboolean        perform_shutdown(void);
... ...
54 54
        return;
55 55
    }
56 56

                
57
#if defined(HAVE_POLKIT) || defined(WIN32) || defined(DARWIN)
58
#ifndef HAVE_POLKIT1
57
#if defined(HAVE_POLKIT1) || defined(HAVE_POLKIT_OLD) || defined(WIN32) || defined(DARWIN)
59 58
    GtkWidget *toolbarMain = nntpgrab_gui_base_get_widget("toolbarMain");
60 59
    GtkToolItem *item = gtk_toggle_tool_button_new();
61 60
    gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), _("Automatic shutdown"));
... ...
67 66
    g_signal_connect(item, "clicked", G_CALLBACK(tool_button_clicked), NULL);
68 67
    g_signal_connect(glue, "all_downloads_completed", G_CALLBACK(all_downloads_completed), NULL);
69 68
#endif
70
#endif
71 69
}
72 70

                
branches/nntpgrab-0.7/client/gui_qt/QNNTPGrabGlue.cpp (revision 1921)
255 255
    QList list_values;
256 256

                
257 257
    i = 0;
258
    while (values[i]) {
258
    while (values && values[i]) {
259 259
        list_values.append(QString::fromUtf8(values[i]));
260 260
        i++;
261 261
    }
branches/nntpgrab-0.7/client/gui_qt/DialogImportNZB.cpp (revision 1921)
318 318
    setVisible(false);
319 319
    loadNZBFile(nzb_data);
320 320
    if (allow_custom_collection_name) {
321
        ui->editNZBFile->setText(QNNTPGrabGlue::utilsSanitizeCollectionName(collection_name));
322
        btnAdd_clicked();
321
        DialogSetCollectionName d(glue, QNNTPGrabGlue::utilsSanitizeCollectionName(collection_name), this);
322
        switch (d.exec()) {
323
            case QDialog::Accepted:
324
                doImportNZB(d.getCollectionName());
325
                close();
326
                break;
327

                
328
            case QDialog::Rejected:
329
                break;
330
        }
323 331
    } else {
324 332
        doImportNZB(QNNTPGrabGlue::utilsSanitizeCollectionName(collection_name));
325 333
    }

Also available in: Unified diff