← Back to branch summary

~ubuntu-branches/debian/stretch/sensors-applet/stretch

« back to all changes in this revision

Viewing changes to sensors-applet/sensor-config-dialog.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach
  • Date: 2011-11-05 14:53:12 UTC
  • mfrom: (1.2.7)
  • Revision ID: package-import@ubuntu.com-20111105145312-pce58z1ov0rc9moq
Tags: 3.0.0-0.1
http://bugs.debian.org/638099
http://bugs.debian.org/633257
http://bugs.debian.org/634515
* Non-maintainer upload.
* New upstream release, with support for GNOME3 Panel (closes: #638099).
* Drop link-to-libdl and libnotify_0.7_api_change patches, applied
  upstream.
* Drop dh_autoreconf and all bootstrap friends from Build-Depends and
  Build-Conflicts, not needed anymore.
* Update Build-Depends for the GTK+3 port, as per configure.ac.
* Drop .a and .la files (closes: #633257).
* Build-Depend on libsensors4 for kfreebsd again, as the package is now
* available on that architecture.
* Avoid hardcoding architecture names for libatamart-dev, and drop it
  entirely for libsensors4, as all architectures should be supported,
  even if the Hurd isn't available yet (closes: #634515).
* As libsensors-applet-plugin hasn't bumped its sonames but has at least
  got an ABI break (due to the switch to GTK+3), and given there are no
  external rdepends, avoid a library rename by bumping its shlibs and
  adding Breaks: sensor-applets (<< 3.0.0).
* Change install path for the applet binary, and remove obsolete dirs.
* Tighten sensors-applet dependency on libsensors-applet-plugin to
  (= ${binary:Version}), just in case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sensors-applet/sensor-config-dialog.c
20
20
#include "config.h"
21
21
#endif /* HAVE_CONFIG_H */
22
22
 
23
 
#include <gnome.h>
 
23
#include <glib/gi18n.h>
24
24
#include "sensor-config-dialog.h"
25
25
#include "sensors-applet.h"
26
26
 
352
352
void sensor_config_dialog_create(SensorsApplet *sensors_applet) {
353
353
        GtkTreeModel *model;
354
354
        GtkTreeIter iter;
 
355
        GtkWidget *content_area;
355
356
 
356
357
        SensorConfigDialog *config_dialog;
357
358
 
395
396
 
396
397
        config_dialog->dialog = gtk_dialog_new_with_buttons(header_text,
397
398
                                                            GTK_WINDOW(sensors_applet->prefs_dialog->dialog),
398
 
                                                            GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
 
399
                                                            GTK_DIALOG_DESTROY_WITH_PARENT,
399
400
                                                            GTK_STOCK_HELP,
400
401
                                                            GTK_RESPONSE_HELP,
401
402
                                                            GTK_STOCK_CLOSE,
402
403
                                                            GTK_RESPONSE_CLOSE,
403
404
                                                            NULL);
 
405
        gtk_window_set_icon_name(GTK_WINDOW(config_dialog->dialog),
 
406
                                 "sensors-applet");
404
407
        
405
408
        g_free(header_text);
406
409
        g_free(sensor_label);
912
915
                                  2, 3,
913
916
                                  14, 15);
914
917
 
915
 
        gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(config_dialog->dialog)->vbox), GTK_WIDGET(config_dialog->table));
 
918
        content_area = gtk_dialog_get_content_area (GTK_DIALOG(config_dialog->dialog));
 
919
        gtk_box_pack_start(GTK_BOX(content_area), GTK_WIDGET(config_dialog->table),
 
920
                FALSE, FALSE, 0);
916
921
        gtk_widget_show_all(config_dialog->dialog);
917
922
 
918
923
}