aboutsummaryrefslogtreecommitdiffstats
path: root/src/camorama-window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/camorama-window.c')
-rw-r--r--src/camorama-window.c49
1 files changed, 4 insertions, 45 deletions
diff --git a/src/camorama-window.c b/src/camorama-window.c
index 70da11a..f5b1c76 100644
--- a/src/camorama-window.c
+++ b/src/camorama-window.c
@@ -32,7 +32,6 @@
#include "callbacks.h"
#include "camorama-filter-chain.h"
#include "camorama-globals.h"
-#include "camorama-stock-items.h"
#include "filter.h"
#include "glib-helpers.h"
#include "support.h"
@@ -168,34 +167,6 @@ static gboolean treeview_clicked_cb(cam_t *cam, GdkEventButton *ev,
return retval;
}
-static gboolean tray_clicked_callback(GtkStatusIcon *icon, GdkEventButton *ev,
- cam_t *cam)
-{
- switch (ev->button) {
- case 1:
- if (gtk_widget_get_visible(GTK_WIDGET(gtk_builder_get_object(cam->xml, "main_window")))) {
- cam->hidden = TRUE;
- g_source_remove(cam->idle_id);
- gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object
- (cam->xml, "main_window")));
- } else {
- cam->idle_id = g_idle_add((GSourceFunc) pt2Function,
- (gpointer) cam);
- gtk_widget_show(GTK_WIDGET(gtk_builder_get_object
- (cam->xml, "main_window")));
- cam->hidden = FALSE;
- }
- break;
- case 3:
- //gw = MyApp->GetMainWindow ();
- //gnomemeeting_component_view (NULL, (gpointer) gw->ldap_window);
- break;
- default:
- break;
- }
- return FALSE;
-}
-
void load_interface(cam_t *cam)
{
unsigned int i;
@@ -227,11 +198,6 @@ void load_interface(cam_t *cam)
g_signal_connect_swapped(treeview, "popup-menu",
G_CALLBACK(treeview_popup_menu_cb), cam);
- logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(window)),
- CAMORAMA_STOCK_WEBCAM, 24, 0, NULL);
- gtk_window_set_default_icon(logo);
- logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(window)),
- "camorama", 48, 0, NULL);
if (cam->show_adjustments == FALSE) {
gtk_widget_hide(GTK_WIDGET(gtk_builder_get_object(cam->xml,
"adjustments_table")));
@@ -247,21 +213,14 @@ void load_interface(cam_t *cam)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_builder_get_object(cam->xml, "show_effects")),
cam->show_effects);
- cam->tray_icon = gtk_status_icon_new_from_stock(CAMORAMA_STOCK_WEBCAM);
- update_tooltip(cam);
- /* add the status to the plug */
- g_object_set_data(G_OBJECT(cam->tray_icon), "available",
- GINT_TO_POINTER(1));
- g_object_set_data(G_OBJECT(cam->tray_icon), "embedded",
- GINT_TO_POINTER(0));
-
- g_signal_connect(cam->tray_icon, "button-press-event",
- G_CALLBACK(tray_clicked_callback), cam);
-
/* connect the signals in the interface
* glade_xml_signal_autoconnect(xml);
* this won't work, can't pass data to callbacks. have to do it individually :(*/
+ logo = gdk_pixbuf_new_from_file(PACKAGE_DATA_DIR
+ "/icons/hicolor/128x128/devices/camorama.png",
+ NULL);
+ gtk_window_set_default_icon(logo);
gtk_window_set_icon(GTK_WINDOW(window), logo);
gtk_window_set_icon(GTK_WINDOW(GTK_WIDGET(gtk_builder_get_object(cam->xml, "prefswindow"))), logo);

Privacy Policy