← Back to branch summary

~darkxst/ubuntu/saucy/gdm/lp1212408

« back to all changes in this revision

Viewing changes to gui/greeter/greeter_canvas_item.c

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2008-09-02 10:37:20 UTC
  • mfrom: (1.4.27 upstream)
  • mto: This revision was merged to the branch mainline in revision 261.
  • Revision ID: james.westby@ubuntu.com-20080902103720-p810vv530hqj45wg
Tags: 2.20.7-3
http://bugs.debian.org/497440
* Install the debian-moreblue-orbit theme, thanks Andre Luiz Rodrigues 
  Ferreira. Closes: #497440.
* 35_gdm.conf.patch: make it the default.
* copyright: fix encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gui/greeter/greeter_canvas_item.c
27
27
#include "gdm.h"
28
28
#include "gdmcommon.h"
29
29
#include "gdmconfig.h"
 
30
 
 
31
#include "gdm-common.h"
 
32
#include "gdm-daemon-config-keys.h"
 
33
 
30
34
#include "greeter.h"
31
35
#include "greeter_item.h"
32
36
#include "greeter_events.h"
37
41
#include "greeter_parser.h"
38
42
 
39
43
/* Keep track of buttons so they can be set sensitive/insensitive */
40
 
extern GtkButton *gtk_ok_button = NULL;
41
 
extern GtkButton *gtk_start_again_button = NULL;
 
44
GtkButton *gtk_ok_button = NULL;
 
45
GtkButton *gtk_start_again_button = NULL;
42
46
 
43
47
static void
44
48
apply_tint (GdkPixbuf *pixbuf, guint32 tint_color)
132
136
                greeter_item_run_action_callback (id);
133
137
}
134
138
 
135
 
void 
 
139
static void 
136
140
menubar_done (GtkMenuShell *menushell, gpointer data)
137
141
{
138
142
        GreeterItemInfo *entry_info = greeter_lookup_id ("user-pw-entry");
155
159
        menu = gtk_menu_new ();
156
160
        gtk_menu_item_set_submenu (GTK_MENU_ITEM (w), menu);
157
161
 
158
 
        w = gtk_menu_item_new_with_mnemonic (_("Select _Language..."));
 
162
        w = gtk_image_menu_item_new_with_mnemonic (_("Select _Language..."));
 
163
        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
 
164
                gtk_image_new_from_icon_name ("preferences-desktop-locale", GTK_ICON_SIZE_MENU));
 
165
 
159
166
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
160
167
        gtk_widget_show (GTK_WIDGET (w));
161
168
        g_signal_connect (G_OBJECT (w), "activate",
162
169
                          G_CALLBACK (activate_button),
163
170
                          "language_button");
164
171
 
165
 
        w = gtk_menu_item_new_with_mnemonic (_("Select _Session..."));
 
172
        w = gtk_image_menu_item_new_with_mnemonic (_("Select _Session..."));
 
173
        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
 
174
                gtk_image_new_from_icon_name ("user-desktop", GTK_ICON_SIZE_MENU));
 
175
 
166
176
        gtk_menu_shell_append (GTK_MENU_SHELL (menu), w);
167
177
        gtk_widget_show (GTK_WIDGET (w));
168
178
        g_signal_connect (G_OBJECT (w), "activate",
176
186
         * flexi, even if not local (non-local xnest).  and Disconnect
177
187
         * only for xdmcp */
178
188
        if ( ! ve_string_empty (g_getenv ("GDM_FLEXI_SERVER"))) {
179
 
                w = gtk_menu_item_new_with_mnemonic (_("_Quit"));
 
189
                w = gtk_image_menu_item_new_with_mnemonic (_("_Quit"));
 
190
                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
 
191
                        gtk_image_new_from_icon_name ("system-log-out", GTK_ICON_SIZE_MENU));
180
192
        } else if (ve_string_empty (g_getenv ("GDM_IS_LOCAL"))) {
181
 
                w = gtk_menu_item_new_with_mnemonic (_("D_isconnect"));
 
193
                w = gtk_image_menu_item_new_with_mnemonic (_("D_isconnect"));
 
194
                gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (w), 
 
195
                        gtk_image_new_from_icon_name ("system-log-out", GTK_ICON_SIZE_MENU));
182
196
        } else {
183
197
                w = NULL;
184
198
        }
465
479
             * should probably be done in the pam item setup thingie.
466
480
             * but this is really widget kind of thing.  I dunno where
467
481
             * this belongs but it's a hack here. */
468
 
            GtkWidget *menubar = make_menubar ();
 
482
            item->data.text.menubar = make_menubar ();
469
483
 
470
484
            gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
471
485
                                   GNOME_TYPE_CANVAS_WIDGET,
472
 
                                   "widget", menubar,
 
486
                                   "widget", item->data.text.menubar,
473
487
                                   "x", (double)x1,
474
488
                                   "y", (double)y1,
475
489
                                   "height", (double)rect.height,
478
492
 
479
493
            greeter_item_register_action_callback ("options_button",
480
494
                                                   (ActionFunc)greeter_options_handler,
481
 
                                                   menubar);
 
495
                                                   item->data.text.menubar);
482
496
            
483
497
            /* Here add a tooltip, so that the user knows about F10 */
484
498
            tooltips = gtk_tooltips_new ();