aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2009-02-26 10:11:34 +0000
committerJuanma Barranquero2009-02-26 10:11:34 +0000
commit8e5a88405c3522c6dfeaae14a1c43b39d7f1550e (patch)
tree9bce221ca19762ded20f8d8d7aebb46624d618bc /src
parent36aecf2288c724d8bc335d001f223a97bf4ebd18 (diff)
downloademacs-8e5a88405c3522c6dfeaae14a1c43b39d7f1550e.tar.gz
emacs-8e5a88405c3522c6dfeaae14a1c43b39d7f1550e.zip
Fix typo in comment.
Diffstat (limited to 'src')
-rw-r--r--src/gtkutil.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 1ce091bcbd7..ee59de91e39 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -522,7 +522,7 @@ get_utf8_string (str)
522 if (!g_utf8_validate (str, -1, NULL)) 522 if (!g_utf8_validate (str, -1, NULL))
523 utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0); 523 utf8_str = g_locale_to_utf8 (str, -1, 0, 0, 0);
524 524
525 if (!utf8_str) 525 if (!utf8_str)
526 { 526 {
527 /* Probably some control characters in str. Escape them. */ 527 /* Probably some control characters in str. Escape them. */
528 size_t nr_bad = 0; 528 size_t nr_bad = 0;
@@ -542,7 +542,7 @@ get_utf8_string (str)
542 error = NULL; 542 error = NULL;
543 } 543 }
544 544
545 if (error) 545 if (error)
546 { 546 {
547 g_error_free (error); 547 g_error_free (error);
548 error = NULL; 548 error = NULL;
@@ -565,12 +565,12 @@ get_utf8_string (str)
565 error = NULL; 565 error = NULL;
566 } 566 }
567 567
568 if (cp) 568 if (cp)
569 { 569 {
570 strcat (utf8_str, cp); 570 strcat (utf8_str, cp);
571 g_free (cp); 571 g_free (cp);
572 } 572 }
573 if (error) 573 if (error)
574 { 574 {
575 g_error_free (error); 575 g_error_free (error);
576 error = NULL; 576 error = NULL;
@@ -1393,8 +1393,8 @@ xg_get_file_with_chooser (f, prompt, default_filename,
1393 wbox = gtk_vbox_new (FALSE, 0); 1393 wbox = gtk_vbox_new (FALSE, 0);
1394 gtk_widget_show (wbox); 1394 gtk_widget_show (wbox);
1395 wtoggle = gtk_check_button_new_with_label ("Show hidden files."); 1395 wtoggle = gtk_check_button_new_with_label ("Show hidden files.");
1396 1396
1397 if (x_gtk_show_hidden_files) 1397 if (x_gtk_show_hidden_files)
1398 { 1398 {
1399 g_object_set (G_OBJECT (filewin), "show-hidden", TRUE, NULL); 1399 g_object_set (G_OBJECT (filewin), "show-hidden", TRUE, NULL);
1400 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), TRUE); 1400 gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wtoggle), TRUE);
@@ -1415,7 +1415,7 @@ xg_get_file_with_chooser (f, prompt, default_filename,
1415 strcat (message, "\nIf you don't like this file selector, use the " 1415 strcat (message, "\nIf you don't like this file selector, use the "
1416 "corresponding\nkey binding or customize " 1416 "corresponding\nkey binding or customize "
1417 "use-file-dialog to turn it off."); 1417 "use-file-dialog to turn it off.");
1418 1418
1419 wmessage = gtk_label_new (message); 1419 wmessage = gtk_label_new (message);
1420 gtk_widget_show (wmessage); 1420 gtk_widget_show (wmessage);
1421 } 1421 }
@@ -1438,7 +1438,7 @@ xg_get_file_with_chooser (f, prompt, default_filename,
1438 an absolute name starting with /. */ 1438 an absolute name starting with /. */
1439 if (default_filename[0] != '/') 1439 if (default_filename[0] != '/')
1440 file = Fexpand_file_name (file, Qnil); 1440 file = Fexpand_file_name (file, Qnil);
1441 1441
1442 utf8_filename = SSDATA (ENCODE_UTF_8 (file)); 1442 utf8_filename = SSDATA (ENCODE_UTF_8 (file));
1443 if (! NILP (Ffile_directory_p (file))) 1443 if (! NILP (Ffile_directory_p (file)))
1444 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin), 1444 gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filewin),
@@ -3134,7 +3134,7 @@ xg_gtk_scroll_destroy (widget, data)
3134} 3134}
3135 3135
3136/* Callback for button press/release events. Used to start timer so that 3136/* Callback for button press/release events. Used to start timer so that
3137 the scroll bar repetition timer in GTK gets handeled. 3137 the scroll bar repetition timer in GTK gets handled.
3138 Also, sets bar->dragging to Qnil when dragging (button release) is done. 3138 Also, sets bar->dragging to Qnil when dragging (button release) is done.
3139 WIDGET is the scroll bar widget the event is for (not used). 3139 WIDGET is the scroll bar widget the event is for (not used).
3140 EVENT contains the event. 3140 EVENT contains the event.
@@ -3450,10 +3450,10 @@ xg_tool_bar_callback (w, client_data)
3450 to `(tool_bar)', see keyboard.c. */ 3450 to `(tool_bar)', see keyboard.c. */
3451 event.kind = TOOL_BAR_EVENT; 3451 event.kind = TOOL_BAR_EVENT;
3452 event.frame_or_window = frame; 3452 event.frame_or_window = frame;
3453 event.arg = frame; 3453 event.arg = frame;
3454 kbd_buffer_store_event (&event); 3454 kbd_buffer_store_event (&event);
3455 3455
3456 event.kind = TOOL_BAR_EVENT; 3456 event.kind = TOOL_BAR_EVENT;
3457 event.frame_or_window = frame; 3457 event.frame_or_window = frame;
3458 event.arg = key; 3458 event.arg = key;
3459 /* Convert between the modifier bits GDK uses and the modifier bits 3459 /* Convert between the modifier bits GDK uses and the modifier bits
@@ -3502,7 +3502,7 @@ xg_tool_bar_menu_proxy (toolitem, user_data)
3502 GtkWidget *wmenuitem = gtk_image_menu_item_new (); 3502 GtkWidget *wmenuitem = gtk_image_menu_item_new ();
3503 GtkWidget *wmenuimage; 3503 GtkWidget *wmenuimage;
3504 3504
3505 if (gtk_button_get_use_stock (wbutton)) 3505 if (gtk_button_get_use_stock (wbutton))
3506 wmenuimage = gtk_image_new_from_stock (gtk_button_get_label (wbutton), 3506 wmenuimage = gtk_image_new_from_stock (gtk_button_get_label (wbutton),
3507 GTK_ICON_SIZE_MENU); 3507 GTK_ICON_SIZE_MENU);
3508 else 3508 else
@@ -3527,7 +3527,7 @@ xg_tool_bar_menu_proxy (toolitem, user_data)
3527 else if (store_type == GTK_IMAGE_PIXBUF) 3527 else if (store_type == GTK_IMAGE_PIXBUF)
3528 { 3528 {
3529 gint width, height; 3529 gint width, height;
3530 3530
3531 if (settings && 3531 if (settings &&
3532 gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU, 3532 gtk_icon_size_lookup_for_settings (settings, GTK_ICON_SIZE_MENU,
3533 &width, &height)) 3533 &width, &height))
@@ -3546,7 +3546,7 @@ xg_tool_bar_menu_proxy (toolitem, user_data)
3546 abort (); 3546 abort ();
3547 } 3547 }
3548 } 3548 }
3549 else if (store_type == GTK_IMAGE_ICON_NAME) 3549 else if (store_type == GTK_IMAGE_ICON_NAME)
3550 { 3550 {
3551 const gchar *icon_name; 3551 const gchar *icon_name;
3552 GtkIconSize icon_size; 3552 GtkIconSize icon_size;
@@ -3788,7 +3788,7 @@ find_rtl_image (f, image, rtl)
3788 for (i = 0; i < f->n_tool_bar_items; ++i) 3788 for (i = 0; i < f->n_tool_bar_items; ++i)
3789 { 3789 {
3790 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES); 3790 Lisp_Object rtl_image = PROP (TOOL_BAR_ITEM_IMAGES);
3791 if (!NILP (file = file_for_image (rtl_image))) 3791 if (!NILP (file = file_for_image (rtl_image)))
3792 { 3792 {
3793 file = call1 (intern ("file-name-sans-extension"), 3793 file = call1 (intern ("file-name-sans-extension"),
3794 Ffile_name_nondirectory (file)); 3794 Ffile_name_nondirectory (file));
@@ -3914,7 +3914,7 @@ update_frame_tool_bar (f)
3914 } 3914 }
3915 else if (gtk_stock_lookup (SSDATA (stock), &stock_item)) 3915 else if (gtk_stock_lookup (SSDATA (stock), &stock_item))
3916 icon_size = gtk_toolbar_get_icon_size (wtoolbar); 3916 icon_size = gtk_toolbar_get_icon_size (wtoolbar);
3917 else 3917 else
3918 { 3918 {
3919 stock = Qnil; 3919 stock = Qnil;
3920 stock_name = NULL; 3920 stock_name = NULL;
@@ -3954,7 +3954,7 @@ update_frame_tool_bar (f)
3954 img_id = lookup_image (f, image); 3954 img_id = lookup_image (f, image);
3955 img = IMAGE_FROM_ID (f, img_id); 3955 img = IMAGE_FROM_ID (f, img_id);
3956 prepare_image_for_display (f, img); 3956 prepare_image_for_display (f, img);
3957 3957
3958 if (img->load_failed_p || img->pixmap == None) 3958 if (img->load_failed_p || img->pixmap == None)
3959 { 3959 {
3960 if (ti) 3960 if (ti)
@@ -3986,7 +3986,7 @@ update_frame_tool_bar (f)
3986 (gpointer) xstrdup (stock_name), 3986 (gpointer) xstrdup (stock_name),
3987 (GDestroyNotify) xfree); 3987 (GDestroyNotify) xfree);
3988 } 3988 }
3989 else if (icon_name) 3989 else if (icon_name)
3990 { 3990 {
3991 w = gtk_image_new_from_icon_name (icon_name, icon_size); 3991 w = gtk_image_new_from_icon_name (icon_name, icon_size);
3992 g_object_set_data_full (G_OBJECT (w), XG_TOOL_BAR_ICON_NAME, 3992 g_object_set_data_full (G_OBJECT (w), XG_TOOL_BAR_ICON_NAME,
@@ -4037,7 +4037,7 @@ update_frame_tool_bar (f)
4037 4037
4038 gtk_widget_set_sensitive (wbutton, enabled_p); 4038 gtk_widget_set_sensitive (wbutton, enabled_p);
4039 gtk_tool_item_set_homogeneous (ti, FALSE); 4039 gtk_tool_item_set_homogeneous (ti, FALSE);
4040 4040
4041 /* Callback to save modifyer mask (Shift/Control, etc). GTK makes 4041 /* Callback to save modifyer mask (Shift/Control, etc). GTK makes
4042 no distinction based on modifiers in the activate callback, 4042 no distinction based on modifiers in the activate callback,
4043 so we have to do it ourselves. */ 4043 so we have to do it ourselves. */