~ubuntu-branches/debian/sid/cheese/sid

« back to all changes in this revision

Viewing changes to src/cheese-no-camera.c

  • Committer: Bazaar Package Importer
  • Author(s): Michael Biebl
  • Date: 2010-05-04 17:37:18 UTC
  • mfrom: (1.1.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100504173718-k2rx3nryi4vd0xyx
Tags: 2.30.1-1
* New upstream release.
  - HAL dependency has been dropped. Use (g)udev for v4l capability probing
    on Linux. Closes: #573774
  - Split code into separate libraries.
* debian/control.in
  - Drop Build-Depends on libhal-dev.
  - Drop Build-Depends on libebook1.2-dev.
  - Bump Build-Depends on libgtk2.0-dev to (>= 2.19.1).
  - Bump Build-Depends on libgstreamer*-dev to (>= 0.10.23).
  - Add Build-Depends on libcanberra-gtk-dev.
  - Add Build-Depends on libxtst-dev.
  - Add Build-Depends on libgudev-1.0-dev on Linux.
  - Bump Standards-Version to 3.8.4. No further changes.
* Switch to source format 3.0 (quilt)
  - Add debian/source/format.
* debian/rules
  - Drop lpia specific configure flags, lpia is dead.
* Update package layout (based on work by Ubuntu)
  - Move data files into new cheese-common package.
  - Keep binary along with its desktop and dbus service file in the cheese
    package.
  - Add libcheese-gtk18 and libcheese-gtk-dev package for the new
    libcheese-gtk library. Use a symbols file for improved shlibs
    dependencies.
  - Add Conflicts/Replaces to cheese-common to ensure proper upgrades from
    previous versions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
28
28
 
29
29
#include "cheese-no-camera.h"
30
30
 
31
 
static void
 
31
void
32
32
cheese_no_camera_set_info_bar_text_and_icon (GtkInfoBar  *info_bar,
33
33
                                             const gchar *icon_stock_id,
34
34
                                             const gchar *primary_text,
61
61
  gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
62
62
  gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
63
63
  gtk_misc_set_alignment (GTK_MISC (primary_label), 0, 0.5);
64
 
  GTK_WIDGET_SET_FLAGS (primary_label, GTK_CAN_FOCUS);
 
64
  gtk_widget_set_can_focus (primary_label, TRUE);
65
65
  gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
66
66
 
67
67
  if (secondary_text != NULL)
72
72
    g_free (secondary_markup);
73
73
    gtk_widget_show (secondary_label);
74
74
    gtk_box_pack_start (GTK_BOX (vbox), secondary_label, TRUE, TRUE, 0);
75
 
    GTK_WIDGET_SET_FLAGS (secondary_label, GTK_CAN_FOCUS);
 
75
    gtk_widget_set_can_focus (secondary_label, TRUE);
76
76
    gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
77
77
    gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
78
78
    gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
88
88
  info_bar = gtk_info_bar_new_with_buttons (GTK_STOCK_HELP, GTK_RESPONSE_HELP, NULL);
89
89
  gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar),
90
90
                                 GTK_MESSAGE_WARNING);
 
91
#if 0
91
92
  cheese_no_camera_set_info_bar_text_and_icon (GTK_INFO_BAR (info_bar),
92
93
                                               "gtk-dialog-error",
93
94
                                               _("No camera found!"),
94
95
                                               _("Please refer to the help for further information."));
 
96
#endif
95
97
 
96
98
  return info_bar;
97
99
}